diff options
| -rw-r--r-- | data/classificator.txt | 2 | ||||
| -rw-r--r-- | data/drules_proto-bw.bin | bin | 153027 -> 153242 bytes | |||
| -rw-r--r-- | data/drules_proto-bw.txt | 109 | ||||
| -rw-r--r-- | data/drules_proto.txt | 132 | ||||
| -rw-r--r-- | data/mapcss-mapping.csv | 2 | ||||
| -rw-r--r-- | data/styles/include/base_place.mapcss | 23 | ||||
| -rw-r--r-- | data/types.txt | 2 |
7 files changed, 265 insertions, 5 deletions
diff --git a/data/classificator.txt b/data/classificator.txt index 8d15c9ea58..d023b9f3fc 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -495,7 +495,9 @@ world + hamlet - island - islet - + isolated_dwelling - locality - + neighbourhood - ocean - region - sea - diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin Binary files differindex ebd16fb307..46b124b268 100644 --- a/data/drules_proto-bw.bin +++ b/data/drules_proto-bw.bin diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt index fb8fa8660f..758ed566d8 100644 --- a/data/drules_proto-bw.txt +++ b/data/drules_proto-bw.txt @@ -37523,6 +37523,50 @@ cont { } } cont { + name: "place-isolated_dwelling" + element { + scale: 16 + caption { + primary { + height: 16 + color: 0 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 17 + caption { + primary { + height: 16 + color: 0 + } + priority: 15000 + } + } + element { + scale: 18 + caption { + primary { + height: 16 + color: 0 + } + priority: 15000 + } + } + element { + scale: 19 + caption { + primary { + height: 16 + color: 0 + } + priority: 15000 + } + } +} +cont { name: "place-locality" element { scale: 14 @@ -37588,6 +37632,71 @@ cont { } } cont { + name: "place-neighbourhood" + element { + scale: 14 + caption { + primary { + height: 12 + color: 0 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 12 + color: 0 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 16 + caption { + primary { + height: 16 + color: 0 + stroke_color: 16777215 + } + priority: 15000 + } + } + element { + scale: 17 + caption { + primary { + height: 16 + color: 0 + } + priority: 15000 + } + } + element { + scale: 18 + caption { + primary { + height: 16 + color: 0 + } + priority: 15000 + } + } + element { + scale: 19 + caption { + primary { + height: 16 + color: 0 + } + priority: 15000 + } + } +} +cont { name: "place-ocean" element { scale: 1 diff --git a/data/drules_proto.txt b/data/drules_proto.txt index fd58a0738d..45abff1cca 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -43875,6 +43875,56 @@ cont { } } cont { + name: "place-isolated_dwelling" + element { + scale: 16 + caption { + primary { + height: 16 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 10066329 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 17 + caption { + primary { + height: 16 + color: 4473924 + } + priority: 15000 + } + } + element { + scale: 18 + caption { + primary { + height: 16 + color: 4473924 + } + priority: 15000 + } + } + element { + scale: 19 + caption { + primary { + height: 16 + color: 4473924 + } + priority: 15000 + } + } +} +cont { name: "place-locality" element { scale: 14 @@ -43957,6 +44007,88 @@ cont { } } cont { + name: "place-neighbourhood" + element { + scale: 14 + caption { + primary { + height: 12 + color: 6710886 + } + secondary { + height: 12 + color: 10066329 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 15 + caption { + primary { + height: 12 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 10066329 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 16 + caption { + primary { + height: 16 + color: 6710886 + stroke_color: 15658717 + } + secondary { + height: 12 + color: 10066329 + stroke_color: 16777215 + offset_y: 20 + } + priority: 15000 + } + } + element { + scale: 17 + caption { + primary { + height: 16 + color: 4473924 + } + priority: 15000 + } + } + element { + scale: 18 + caption { + primary { + height: 16 + color: 4473924 + } + priority: 15000 + } + } + element { + scale: 19 + caption { + primary { + height: 16 + color: 4473924 + } + priority: 15000 + } + } +} +cont { name: "place-ocean" element { scale: 1 diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 29cf3aed06..617bcd570c 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -959,3 +959,5 @@ waterway|waterfall;[waterway=waterfall];;name;int_name;958; railway|proposed;[railway=proposed];name;int_name;959; amenity|casino;[amenity=casino];;name;int_name;960; amenity|brothel;[amenity=brothel];;name;int_name;961; +place|neighbourhood;[place=neighbourhood];;name;int_name;962; +place|isolated_dwelling;[place=isolated_dwelling];;name;int_name;963; diff --git a/data/styles/include/base_place.mapcss b/data/styles/include/base_place.mapcss index b7613b8eab..390e870174 100644 --- a/data/styles/include/base_place.mapcss +++ b/data/styles/include/base_place.mapcss @@ -157,7 +157,8 @@ node|z6[place=country] } node|z6[place=city], node|z15[place=locality], -node|z12-13[place=village] +node|z15[place=neighbourhood], +node|z12-13[place=village], { font-size: 12; text-halo-radius: 2; @@ -226,14 +227,17 @@ area|z15-[place=farm], node|z15-[place=farm], node|z12-15[place=hamlet], node|z14[place=locality], -node|z8-9[place=region] +node|z14[place=neighbourhood], +node|z8-9[place=region], { text: name; font-size: 12; text-color: #606060; } node|z8-9[place=city][capital?], -node|z16[place=locality] +node|z16[place=locality], +node|z16[place=neighbourhood], +node|z16[place=isolated_dwelling], { font-size: 16; text-halo-radius: 2; @@ -464,7 +468,12 @@ node|z14[place=village] text-halo-color: #eeeedd; } area|z14-16[place=locality]::int_name, -node|z14-16[place=locality]::int_name +node|z14-16[place=locality]::int_name, +area|z14-16[place=neighbourhood]::int_name, +node|z14-16[place=neighbourhood]::int_name, +area|z16[place=isolated_dwelling]::int_name, +node|z16[place=isolated_dwelling]::int_name, + { text: int_name; font-size: 12; @@ -519,7 +528,11 @@ node|z17-[place=village] text-halo-color: #eeeedd; } area|z17-[place=locality], -node|z17-[place=locality] +node|z17-[place=locality], +area|z17-[place=neighbourhood], +node|z17-[place=neighbourhood], +area|z17-[place=isolated_dwelling], +node|z17-[place=isolated_dwelling], { text: name; font-size: 16; diff --git a/data/types.txt b/data/types.txt index 33becadc34..dbc2e1991d 100644 --- a/data/types.txt +++ b/data/types.txt @@ -959,3 +959,5 @@ waterway|waterfall railway|proposed amenity|casino amenity|brothel +place|neighbourhood +place|isolated_dwelling |