diff --git a/.gitignore b/.gitignore index 0cecec7..36a416f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ .DS_Store -dist/*.zip \ No newline at end of file +dist diff --git a/VERSION b/VERSION index 4b49d9b..468c41f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0 \ No newline at end of file +7.2.1 \ No newline at end of file diff --git a/dist/themes/black.zip b/dist/themes/black.zip deleted file mode 100644 index e71a060..0000000 Binary files a/dist/themes/black.zip and /dev/null differ diff --git a/dist/themes/blue-gray.zip b/dist/themes/blue-gray.zip deleted file mode 100644 index c24498a..0000000 Binary files a/dist/themes/blue-gray.zip and /dev/null differ diff --git a/dist/themes/blue.zip b/dist/themes/blue.zip deleted file mode 100644 index 088a3ee..0000000 Binary files a/dist/themes/blue.zip and /dev/null differ diff --git a/dist/themes/brown-orange.zip b/dist/themes/brown-orange.zip deleted file mode 100644 index bb80fa3..0000000 Binary files a/dist/themes/brown-orange.zip and /dev/null differ diff --git a/dist/themes/color.zip b/dist/themes/color.zip deleted file mode 100644 index 3866aa5..0000000 Binary files a/dist/themes/color.zip and /dev/null differ diff --git a/dist/themes/gray-gold.zip b/dist/themes/gray-gold.zip deleted file mode 100644 index a001307..0000000 Binary files a/dist/themes/gray-gold.zip and /dev/null differ diff --git a/dist/themes/gray.zip b/dist/themes/gray.zip deleted file mode 100644 index e45eead..0000000 Binary files a/dist/themes/gray.zip and /dev/null differ diff --git a/dist/themes/high-contrast.zip b/dist/themes/high-contrast.zip deleted file mode 100644 index 6df30ac..0000000 Binary files a/dist/themes/high-contrast.zip and /dev/null differ diff --git a/dist/themes/inverted-blue.zip b/dist/themes/inverted-blue.zip deleted file mode 100644 index 76c515c..0000000 Binary files a/dist/themes/inverted-blue.zip and /dev/null differ diff --git a/dist/themes/inverted.zip b/dist/themes/inverted.zip deleted file mode 100644 index 5509b93..0000000 Binary files a/dist/themes/inverted.zip and /dev/null differ diff --git a/dist/themes/pink-yellow.zip b/dist/themes/pink-yellow.zip deleted file mode 100644 index 0acaf95..0000000 Binary files a/dist/themes/pink-yellow.zip and /dev/null differ diff --git a/dist/themes/pink.zip b/dist/themes/pink.zip deleted file mode 100644 index 5b4e53c..0000000 Binary files a/dist/themes/pink.zip and /dev/null differ diff --git a/dist/themes/purple-green.zip b/dist/themes/purple-green.zip deleted file mode 100644 index 41f46ef..0000000 Binary files a/dist/themes/purple-green.zip and /dev/null differ diff --git a/dist/themes/sepia.zip b/dist/themes/sepia.zip deleted file mode 100644 index 7f23bab..0000000 Binary files a/dist/themes/sepia.zip and /dev/null differ diff --git a/refill-style.yaml b/refill-style.yaml index 5051ced..e094488 100644 --- a/refill-style.yaml +++ b/refill-style.yaml @@ -1231,15 +1231,6 @@ styles: color.rgb, step(.5,dot(vec3(0., 0., 1.), worldNormal()))); - rock: - base: polygons - material: - diffuse: - texture: images/building-grid.gif - mapping: planar - scale: .001 - - building-lines: base: lines mix: scale-buildings @@ -2608,8 +2599,7 @@ layers: $zoom: { max: 15 } draw: lines: - order: - order: 351 + order: 351 outline: order: 350 pedestrian: @@ -3997,7 +3987,7 @@ layers: text-blend-order: priority: 6 font: - size: [[2,11px],[6,15px],[8,18px],[10,20px],[12,20x],[13,0px]] + size: [[2,11px],[6,15px],[8,18px],[10,20px],[12,20px],[13,0px]] capital: filter: { country_capital: true, $zoom: { min: 5 } } draw: diff --git a/themes/blue-gray.yaml b/themes/blue-gray.yaml index 971d638..d881b97 100644 --- a/themes/blue-gray.yaml +++ b/themes/blue-gray.yaml @@ -257,6 +257,6 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast3.gif + url: images/building-grid-hi-contrast3.gif diff --git a/themes/brown-orange.yaml b/themes/brown-orange.yaml index 4aa4ddf..fc5a2e2 100644 --- a/themes/brown-orange.yaml +++ b/themes/brown-orange.yaml @@ -258,6 +258,6 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast3.gif + url: images/building-grid-hi-contrast3.gif diff --git a/themes/color.yaml b/themes/color.yaml index 11defb2..2c536f1 100644 --- a/themes/color.yaml +++ b/themes/color.yaml @@ -486,8 +486,8 @@ styles: dash_background_color: [0.984,0.980,1.000] textures: - building-grid: - url: ../images/building-grid.gif +# building-grid: +# url: images/building-grid.gif building-grid-bold: - url: ../images/building-grid-bold.gif + url: images/building-grid-bold.gif diff --git a/themes/gray-gold.yaml b/themes/gray-gold.yaml index aafca21..6b25760 100644 --- a/themes/gray-gold.yaml +++ b/themes/gray-gold.yaml @@ -305,4 +305,4 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast3.gif + url: images/building-grid-hi-contrast3.gif diff --git a/themes/high-contrast.yaml b/themes/high-contrast.yaml index d71b6de..919b88c 100644 --- a/themes/high-contrast.yaml +++ b/themes/high-contrast.yaml @@ -252,4 +252,4 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast3.gif + url: images/building-grid-hi-contrast3.gif diff --git a/images/building-grid-bold.gif b/themes/images/building-grid-bold.gif similarity index 100% rename from images/building-grid-bold.gif rename to themes/images/building-grid-bold.gif diff --git a/images/building-grid-hi-contrast.gif b/themes/images/building-grid-hi-contrast.gif similarity index 100% rename from images/building-grid-hi-contrast.gif rename to themes/images/building-grid-hi-contrast.gif diff --git a/images/building-grid-hi-contrast2.gif b/themes/images/building-grid-hi-contrast2.gif similarity index 100% rename from images/building-grid-hi-contrast2.gif rename to themes/images/building-grid-hi-contrast2.gif diff --git a/images/building-grid-hi-contrast3.gif b/themes/images/building-grid-hi-contrast3.gif similarity index 100% rename from images/building-grid-hi-contrast3.gif rename to themes/images/building-grid-hi-contrast3.gif diff --git a/images/building-grid-hi-contrast4.gif b/themes/images/building-grid-hi-contrast4.gif similarity index 100% rename from images/building-grid-hi-contrast4.gif rename to themes/images/building-grid-hi-contrast4.gif diff --git a/themes/inverted-blue.yaml b/themes/inverted-blue.yaml index cd19fc2..3d55590 100644 --- a/themes/inverted-blue.yaml +++ b/themes/inverted-blue.yaml @@ -150,7 +150,7 @@ styles: base: polygons material: diffuse: - texture: ../images/rock.png + texture: images/rock.png mapping: planar scale: .001 @@ -294,4 +294,4 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast3.gif + url: images/building-grid-hi-contrast3.gif diff --git a/themes/inverted.yaml b/themes/inverted.yaml index ba2b042..8327ae5 100644 --- a/themes/inverted.yaml +++ b/themes/inverted.yaml @@ -272,4 +272,4 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast3.gif + url: images/building-grid-hi-contrast3.gif diff --git a/themes/pink-yellow.yaml b/themes/pink-yellow.yaml index b2025da..15cd606 100644 --- a/themes/pink-yellow.yaml +++ b/themes/pink-yellow.yaml @@ -258,6 +258,6 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast3.gif + url: images/building-grid-hi-contrast3.gif diff --git a/themes/purple-green.yaml b/themes/purple-green.yaml index d40110b..91de3d3 100644 --- a/themes/purple-green.yaml +++ b/themes/purple-green.yaml @@ -281,4 +281,4 @@ styles: textures: building-grid: - url: ../images/building-grid-hi-contrast3.gif + url: images/building-grid-hi-contrast3.gif