diff options
author | vng <viktor.govako@gmail.com> | 2014-08-31 13:35:35 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:25:45 +0300 |
commit | 9b2f877aca6d85e765165a0b9048319ae414d289 (patch) | |
tree | d5eda52c39db3bf1aa693e00a921e000b18c7778 | |
parent | d1c4ebbc431bfe5d53e0ea32ef54a725cb49fcd9 (diff) |
[classificator] Added internet_access types.
-rw-r--r-- | data/classificator.txt | 3 | ||||
-rw-r--r-- | data/drules_proto.bin | bin | 190431 -> 190624 bytes | |||
-rw-r--r-- | data/drules_proto.txt | 78 | ||||
-rw-r--r-- | data/mapcss-mapping.csv | 2 | ||||
-rw-r--r-- | data/styles/normal.mapcss | 3 | ||||
-rw-r--r-- | data/types.txt | 2 |
6 files changed, 88 insertions, 0 deletions
diff --git a/data/classificator.txt b/data/classificator.txt index d571e0e817..170c0bbddb 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -336,6 +336,9 @@ world + wayside_cross - wayside_shrine - {} + internet_access + + wlan - + {} landuse + allotments - basin - diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex a37516a7cd..61de3a1136 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 101850060a..61dedbad5b 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -33809,6 +33809,84 @@ cont { } } cont { + name: "internet_access" + element { + scale: 17 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { + name: "internet_access-wlan" + element { + scale: 17 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "landuse-allotments" element { scale: 12 diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 1ab2945871..addc58b5d1 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -981,3 +981,5 @@ craft|metal_construction;[craft=metal_construction];;name;int_name;980; craft|hvac;[craft=hvac];;name;int_name;981; craft|painter;[craft=painter];;name;int_name;982; craft|gardener;[craft=gardener];;name;int_name;983; +internet_access;[internet_access=yes];;name;int_name;984; +internet_access|wlan;[internet_access=wlan];;name;int_name;985; diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss index 24776fb420..d6540abc2b 100644 --- a/data/styles/normal.mapcss +++ b/data/styles/normal.mapcss @@ -47,6 +47,7 @@ area::* { *[power], *[landuse], *[craft], +*[internet_access], { text-position: center } @@ -2180,11 +2181,13 @@ area|z17-[historic], area|z17-[office][office!=no], area|z17-[tourism], area|z17-[craft], +area|z17-[internet_access], node|z17-[amenity], node|z17-[historic], node|z17-[office][office!=no], node|z17-[tourism], node|z17-[craft], +node|z17-[internet_access], { font-size: 11; text-halo-radius: 2; diff --git a/data/types.txt b/data/types.txt index 356102eb0a..72df75b657 100644 --- a/data/types.txt +++ b/data/types.txt @@ -981,3 +981,5 @@ craft|metal_construction craft|hvac craft|painter craft|gardener +internet_access +internet_access|wlan |