diff options
author | vng <viktor.govako@gmail.com> | 2014-06-16 16:54:08 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:18:15 +0300 |
commit | 6c51fe243e5c08b028b2b0ce2453f0e07639b672 (patch) | |
tree | e3ddc4a95cc43ae1725a8a822cd2e4efcc149eb9 /data | |
parent | ea00c6e665ec91940c3b6015f3f79ff6b309181f (diff) |
[classificator] Added some historic types.
Diffstat (limited to 'data')
-rw-r--r-- | data/classificator.txt | 5 | ||||
-rw-r--r-- | data/drules_proto-bw.bin | bin | 153242 -> 153841 bytes | |||
-rw-r--r-- | data/drules_proto-bw.txt | 333 | ||||
-rw-r--r-- | data/drules_proto.bin | bin | 187686 -> 188277 bytes | |||
-rw-r--r-- | data/drules_proto.txt | 226 | ||||
-rw-r--r-- | data/mapcss-mapping.csv | 5 | ||||
-rw-r--r-- | data/styles/normal.mapcss | 3 | ||||
-rw-r--r-- | data/types.txt | 5 |
8 files changed, 537 insertions, 40 deletions
diff --git a/data/classificator.txt b/data/classificator.txt index d023b9f3fc..2024f7ee4e 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -311,12 +311,17 @@ world + historic + archaeological_site - battlefield - + boundary_stone - castle - + citywalls - memorial - monument - museum - ruins - ship - + tomb - + wayside_cross - + wayside_shrine - {} landuse + allotments - diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin Binary files differindex 46b124b268..177176fc9b 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 758ed566d8..adaebdccbd 100644 --- a/data/drules_proto-bw.txt +++ b/data/drules_proto-bw.txt @@ -4583,35 +4583,35 @@ cont { element { scale: 15 area { - color: 14535867 + color: 13421738 priority: 1368 } } element { scale: 16 area { - color: 14535867 + color: 13421738 priority: 1368 } } element { scale: 17 area { - color: 14535867 + color: 13421738 priority: 1368 } } element { scale: 18 area { - color: 14535867 + color: 13421738 priority: 1368 } } element { scale: 19 area { - color: 14535867 + color: 13421738 priority: 1368 } } @@ -16086,12 +16086,16 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 15658734 + width: 2.0 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16103,12 +16107,16 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 15658734 + width: 3.0 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16121,11 +16129,15 @@ cont { scale: 17 lines { width: 7.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16138,11 +16150,15 @@ cont { scale: 18 lines { width: 9.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16155,11 +16171,15 @@ cont { scale: 19 lines { width: 17.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16174,7 +16194,7 @@ cont { element { scale: 15 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16188,7 +16208,7 @@ cont { element { scale: 16 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16202,7 +16222,7 @@ cont { element { scale: 17 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16216,7 +16236,7 @@ cont { element { scale: 18 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16230,7 +16250,7 @@ cont { element { scale: 19 area { - color: 15658734 + color: 13421738 priority: 1027 } path_text { @@ -16247,26 +16267,30 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 15658734 + width: 2.0 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 11.0 + width: 10.0 color: 16777215 priority: 1007 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 13.0 + width: 12.0 color: 7829367 priority: 1004 join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16278,26 +16302,30 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 15658734 + width: 3.0 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 12.0 + width: 11.0 color: 16777215 priority: 1007 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 14.0 + width: 13.0 color: 7829367 priority: 1004 join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16310,7 +16338,7 @@ cont { scale: 17 lines { width: 7.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16329,6 +16357,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16341,7 +16373,7 @@ cont { scale: 18 lines { width: 9.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16360,6 +16392,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16372,7 +16408,7 @@ cont { scale: 19 lines { width: 17.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16391,6 +16427,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16405,21 +16445,21 @@ cont { element { scale: 15 lines { - width: 3.0 - color: 15658734 + width: 2.0 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 11.0 + width: 10.0 color: 16777215 priority: 1007 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 13.0 + width: 12.0 color: 7829367 dashdot { dd: 5.0 @@ -16429,6 +16469,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16440,21 +16484,21 @@ cont { element { scale: 16 lines { - width: 4.0 - color: 15658734 + width: 3.0 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP } lines { - width: 12.0 + width: 11.0 color: 16777215 priority: 1007 join: ROUNDJOIN cap: BUTTCAP } lines { - width: 14.0 + width: 13.0 color: 7829367 dashdot { dd: 5.0 @@ -16464,6 +16508,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16476,7 +16524,7 @@ cont { scale: 17 lines { width: 7.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16499,6 +16547,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16511,7 +16563,7 @@ cont { scale: 18 lines { width: 9.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16534,6 +16586,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -16546,7 +16602,7 @@ cont { scale: 19 lines { width: 17.0 - color: 15658734 + color: 13421738 priority: 1026 join: ROUNDJOIN cap: ROUNDCAP @@ -16569,6 +16625,10 @@ cont { join: ROUNDJOIN cap: BUTTCAP } + area { + color: 13421738 + priority: 1027 + } path_text { primary { height: 10 @@ -30706,6 +30766,45 @@ cont { } } cont { + name: "historic-boundary_stone" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "historic-castle" element { scale: 16 @@ -30764,6 +30863,45 @@ cont { } } cont { + name: "historic-citywalls" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "historic-memorial" element { scale: 16 @@ -31075,6 +31213,123 @@ cont { } } cont { + name: "historic-tomb" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { + name: "historic-wayside_cross" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { + name: "historic-wayside_shrine" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "landuse-basin" element { scale: 12 diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex bc141cc1c9..d187e69333 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 45abff1cca..dbaf3bcb5e 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -32785,6 +32785,45 @@ cont { } } cont { + name: "historic-boundary_stone" + 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: "historic-castle" element { scale: 16 @@ -32843,6 +32882,76 @@ cont { } } cont { + name: "historic-citywalls" + element { + scale: 16 + lines { + width: 0.1 + color: 12303291 + priority: 1917 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 17 + lines { + width: 0.1 + color: 12303291 + priority: 1002 + join: ROUNDJOIN + cap: ROUNDCAP + } + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + lines { + width: 0.1 + color: 12303291 + priority: 1002 + join: ROUNDJOIN + cap: ROUNDCAP + } + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + lines { + width: 0.1 + color: 12303291 + priority: 1002 + join: ROUNDJOIN + cap: ROUNDCAP + } + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "historic-memorial" element { scale: 16 @@ -33154,6 +33263,123 @@ cont { } } cont { + name: "historic-tomb" + 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: "historic-wayside_cross" + 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: "historic-wayside_shrine" + 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 617bcd570c..8ed4871d5b 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -961,3 +961,8 @@ 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; +historic|wayside_cross;[historic=wayside_cross];;name;int_name;964; +historic|wayside_shrine;[historic=wayside_shrine];;name;int_name;965; +historic|boundary_stone;[historic=boundary_stone];;name;int_name;966; +historic|citywalls;[historic=citywalls];;name;int_name;967; +historic|tomb;[historic=tomb];;name;int_name;968; diff --git a/data/styles/normal.mapcss b/data/styles/normal.mapcss index 8e01c18ea7..755681f04b 100644 --- a/data/styles/normal.mapcss +++ b/data/styles/normal.mapcss @@ -3379,7 +3379,8 @@ node|z17-[tourism=information][information=guidepost] { icon-image: information-guidepost.svg; } -line|z16-[barrier=fence] +line|z16-[barrier=fence], +line|z16-[historic=citywalls] { color: #b0b0b0; width: .1; diff --git a/data/types.txt b/data/types.txt index dbc2e1991d..1078a778ce 100644 --- a/data/types.txt +++ b/data/types.txt @@ -961,3 +961,8 @@ amenity|casino amenity|brothel place|neighbourhood place|isolated_dwelling +historic|wayside_cross +historic|wayside_shrine +historic|boundary_stone +historic|citywalls +historic|tomb |