Skip to content

Commit

Permalink
Render themes: texture atlas separation, closes opensciencemap#59
Browse files Browse the repository at this point in the history
  • Loading branch information
@devemux86
devemux86 committed Jul 13, 2016
1 parent 43ca550 commit ba00a53
Show file tree
Hide file tree
Showing 21 changed files with 205 additions and 147 deletions.
0 .../resources/assets/styles/poi_icons_16.png → ...d/resources/assets/icons/poi_icons_16.png
View file
File renamed without changes
0 .../resources/assets/styles/poi_icons_20.png → ...d/resources/assets/icons/poi_icons_20.png
View file
File renamed without changes
0 .../resources/assets/styles/poi_icons_24.png → ...d/resources/assets/icons/poi_icons_24.png
View file
File renamed without changes
0 .../resources/assets/styles/poi_icons_28.png → ...d/resources/assets/icons/poi_icons_28.png
View file
File renamed without changes
0 .../resources/assets/styles/poi_icons_32.png → ...d/resources/assets/icons/poi_icons_32.png
View file
File renamed without changes
2 changes: 1 addition & 1 deletion vtm-playground/resources/assets/styles/mapzen.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version="1" xmlns="http://opensciencemap.org/rendertheme"
xsi:schemaLocation="http://opensciencemap.org/rendertheme ../../rendertheme.xsd">
<!-- icons 32 -->
<atlas img="styles/poi_icons_32.png">
<atlas img="icons/poi_icons_32.png">
<rect id="1_airport" pos="0 0 32 32" />
<rect id="2_taxi " pos="0 37 32 32" />
<rect id="3_train" pos="0 74 32 32" />
Expand Down
0 vtm-themes/resources/assets/styles/maki.png → vtm-themes/icons/maki.png
View file
File renamed without changes
95 changes: 95 additions & 0 deletions vtm-themes/icons/maki.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<atlas img="icons/maki.png">
<rect id="airfield" pos="1 105 24 24" />
<rect id="airport" pos="1 79 24 24" />
<rect id="alcohol-shop" pos="27 105 24 24" />
<rect id="america-football" pos="1 53 24 24" />
<rect id="art-gallery" pos="27 79 24 24" />
<rect id="bank" pos="53 105 24 24" />
<rect id="bar" pos="1 27 24 24" />
<rect id="baseball" pos="27 53 24 24" />
<rect id="basketball" pos="53 79 24 24" />
<rect id="beer" pos="79 105 24 24" />
<rect id="bicycle" pos="1 1 24 24" />
<rect id="building" pos="27 27 24 24" />
<rect id="bus" pos="53 53 24 24" />
<rect id="cafe" pos="79 79 24 24" />
<rect id="campsite" pos="105 105 24 24" />
<rect id="cemetery" pos="27 1 24 24" />
<rect id="cinema" pos="53 27 24 24" />
<rect id="circle" pos="105 79 24 24" />
<rect id="circle-stroked" pos="79 53 24 24" />
<rect id="city" pos="131 105 24 24" />
<rect id="college" pos="53 1 24 24" />
<rect id="commercial" pos="79 27 24 24" />
<rect id="cricket" pos="105 53 24 24" />
<rect id="cross" pos="131 79 24 24" />
<rect id="dam" pos="157 105 24 24" />
<rect id="danger" pos="79 1 24 24" />
<rect id="disability" pos="105 27 24 24" />
<rect id="embassy" pos="131 53 24 24" />
<rect id="emergency-telephone" pos="157 79 24 24" />
<rect id="farm" pos="183 105 24 24" />
<rect id="fast-food" pos="105 1 24 24" />
<rect id="ferry" pos="131 27 24 24" />
<rect id="fire-station" pos="157 53 24 24" />
<rect id="fuel" pos="183 79 24 24" />
<rect id="garden" pos="209 105 24 24" />
<rect id="golf" pos="131 1 24 24" />
<rect id="grocery" pos="157 27 24 24" />
<rect id="harbor" pos="183 53 24 24" />
<rect id="heliport" pos="209 79 24 24" />
<rect id="hospital" pos="235 105 24 24" />
<rect id="industrial" pos="157 1 24 24" />
<rect id="land-use" pos="183 27 24 24" />
<rect id="library" pos="209 53 24 24" />
<rect id="lodging" pos="235 79 24 24" />
<rect id="logging" pos="261 105 24 24" />
<rect id="marker" pos="209 27 24 24" />
<rect id="marker-stroked" pos="183 1 24 24" />
<rect id="monument" pos="235 53 24 24" />
<rect id="museum" pos="261 79 24 24" />
<rect id="music" pos="287 105 24 24" />
<rect id="oil-well" pos="209 1 24 24" />
<rect id="park" pos="235 27 24 24" />
<rect id="park2" pos="261 53 24 24" />
<rect id="parking" pos="313 105 24 24" />
<rect id="parking-garage" pos="287 79 24 24" />
<rect id="pharmacy" pos="235 1 24 24" />
<rect id="pitch" pos="261 27 24 24" />
<rect id="place-of-worship" pos="287 53 24 24" />
<rect id="police" pos="313 79 24 24" />
<rect id="post" pos="339 105 24 24" />
<rect id="prison" pos="261 1 24 24" />
<rect id="rail" pos="339 79 24 24" />
<rect id="rail-above" pos="287 27 24 24" />
<rect id="rail-underground" pos="313 53 24 24" />
<rect id="religious-christian" pos="365 105 24 24" />
<rect id="religious-jewish" pos="287 1 24 24" />
<rect id="religious-muslim" pos="313 27 24 24" />
<rect id="restaurant" pos="339 53 24 24" />
<rect id="roadblock" pos="365 79 24 24" />
<rect id="school" pos="391 105 24 24" />
<rect id="shop" pos="313 1 24 24" />
<rect id="skiing" pos="339 27 24 24" />
<rect id="slaughterhouse" pos="365 53 24 24" />
<rect id="soccer" pos="391 79 24 24" />
<rect id="square" pos="339 1 24 24" />
<rect id="square-stroked" pos="417 105 24 24" />
<rect id="star" pos="391 53 24 24" />
<rect id="star-stroked" pos="365 27 24 24" />
<rect id="swimming" pos="417 79 24 24" />
<rect id="telephone" pos="443 105 24 24" />
<rect id="tennis" pos="365 1 24 24" />
<rect id="theatre" pos="391 27 24 24" />
<rect id="toilets" pos="417 53 24 24" />
<rect id="town" pos="469 105 24 24" />
<rect id="town-hall" pos="443 79 24 24" />
<rect id="triangle" pos="417 27 24 24" />
<rect id="triangle-stroked" pos="391 1 24 24" />
<rect id="village" pos="443 53 24 24" />
<rect id="warehouse" pos="469 79 24 24" />
<rect id="waste-basket" pos="417 1 24 24" />
<rect id="water" pos="443 27 24 24" />
<rect id="wetland" pos="469 53 24 24" />
<rect id="zoo" pos="443 1 24 24" />
</atlas>
95 changes: 0 additions & 95 deletions vtm-themes/icons/maki/atlas.xml
View file

This file was deleted.

0 vtm-themes/resources/assets/styles/osm.png → vtm-themes/icons/osm.png
View file
File renamed without changes
44 changes: 44 additions & 0 deletions vtm-themes/icons/osm.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<atlas img="icons/osm.png">
<rect id="airport" pos="1 40 16 16" />
<rect id="atm" pos="19 40 16 16" />
<rect id="bar" pos="1 80 20 20" />
<rect id="cafe" pos="67 88 16 16" />
<rect id="camping" pos="71 110 16 16" />
<rect id="cinema" pos="1 102 24 24" />
<rect id="city" pos="55 11 10 10" />
<rect id="department_store" pos="67 70 16 16" />
<rect id="fast_food" pos="67 52 16 16" />
<rect id="florist" pos="67 34 16 16" />
<rect id="food_bar" pos="1 22 16 16" />
<rect id="food_drinkingtap" pos="23 80 20 20" />
<rect id="hospital" pos="19 22 16 16" />
<rect id="hostel" pos="27 106 20 20" />
<rect id="hotel" pos="45 84 20 20" />
<rect id="information" pos="37 22 16 16" />
<rect id="library" pos="49 106 20 20" />
<rect id="museum" pos="67 16 16 16" />
<rect id="parking" pos="1 4 16 16" />
<rect id="pharmacy" pos="19 4 16 16" />
<rect id="place_of_worship" pos="37 4 16 16" />
<rect id="playground" pos="45 62 20 20" />
<rect id="police" pos="85 92 16 16" />
<rect id="pub" pos="89 110 16 16" />
<rect id="rental_bicycle" pos="1 58 20 20" />
<rect id="restaurant" pos="85 74 16 16" />
<rect id="school" pos="85 56 16 16" />
<rect id="shop_bakery" pos="85 38 16 16" />
<rect id="shop_butcher" pos="85 20 16 16" />
<rect id="shop_clothes" pos="85 2 16 16" />
<rect id="shop_convenience" pos="103 92 16 16" />
<rect id="shop_diy" pos="107 110 16 16" />
<rect id="shop_hairdresser" pos="103 74 16 16" />
<rect id="shop_supermarket" pos="103 56 16 16" />
<rect id="shopping_bicycle" pos="103 38 16 16" />
<rect id="telephone" pos="103 20 16 16" />
<rect id="theatre" pos="23 58 20 20" />
<rect id="toilets" pos="45 40 20 20" />
<rect id="town" pos="67 3 11 11" />
<rect id="view_point" pos="103 2 16 16" />
<rect id="volcano" pos="55 1 9 8" />
<rect id="windmill" pos="55 23 10 15" />
</atlas>
42 changes: 0 additions & 42 deletions vtm-themes/icons/osm/osm.xml
View file

This file was deleted.

0 ...es/resources/assets/styles/osmarender.png → vtm-themes/icons/osmarender.png
View file
File renamed without changes
60 changes: 60 additions & 0 deletions vtm-themes/icons/osmarender.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<atlas img="icons/osmarender.png">
<rect id="airport" pos="226 38 24 24" />
<rect id="alpine_hut" pos="198 41 26 21" />
<rect id="atm" pos="279 2 14 16" />
<rect id="bakery" pos="305 46 22 16" />
<rect id="bank" pos="395 43 19 19" />
<rect id="bench" pos="213 29 8 10" />
<rect id="bicycle_rental" pos="295 2 13 16" />
<rect id="bus" pos="130 32 23 9" />
<rect id="bus_sta" pos="36 30 31 32" />
<rect id="cable_car" pos="2 2 29 26" />
<rect id="cafe" pos="216 2 14 14" />
<rect id="campSite" pos="329 42 20 20" />
<rect id="cave_entrance" pos="297 23 16 10" />
<rect id="chair_lift" pos="130 2 13 28" />
<rect id="church" pos="61 9 9 19" />
<rect id="cinema" pos="145 8 16 22" />
<rect id="drinking_water" pos="416 43 19 19" />
<rect id="fastfood" pos="351 42 20 20" />
<rect id="firebrigade" pos="130 43 36 19" />
<rect id="florist" pos="342 24 12 16" />
<rect id="fountain" pos="500 46 10 16" />
<rect id="gondola" pos="252 38 21 24" />
<rect id="helipad" pos="69 31 31 31" />
<rect id="hospital" pos="437 43 19 19" />
<rect id="hostel" pos="168 44 28 18" />
<rect id="hotel" pos="93 11 18 17" />
<rect id="information" pos="458 43 19 19" />
<rect id="kindergarten" pos="184 2 14 19" />
<rect id="library" pos="372 22 9 18" />
<rect id="mosque" pos="248 2 17 15" />
<rect id="oneway" pos="275 38 25 7" />
<rect id="parking" pos="373 42 20 20" />
<rect id="peak" pos="267 9 9 8" />
<rect id="petrolStation" pos="263 19 14 17" />
<rect id="pharmacy" pos="479 43 19 19" />
<rect id="playground" pos="223 18 18 18" />
<rect id="postbox" pos="232 2 14 14" />
<rect id="postoffice" pos="172 23 19 19" />
<rect id="pub" pos="326 26 14 14" />
<rect id="railway-crossing" pos="275 47 28 15" />
<rect id="railway-crossing-small" pos="155 32 15 9" />
<rect id="recycling" pos="72 11 19 18" />
<rect id="restaurant" pos="356 28 14 12" />
<rect id="school" pos="200 2 14 19" />
<rect id="shelter" pos="33 4 26 24" />
<rect id="soccer-borderless" pos="102 30 26 32" />
<rect id="supermarket" pos="193 23 18 16" />
<rect id="synagogue" pos="113 11 15 17" />
<rect id="telephone" pos="383 21 7 19" />
<rect id="tennis" pos="2 30 32 32" />
<rect id="theatre" pos="243 19 18 17" />
<rect id="toilets" pos="163 2 19 19" />
<rect id="traffic_signal" pos="392 21 7 19" />
<rect id="tree" pos="145 2 4 4" />
<rect id="university" pos="302 35 19 9" />
<rect id="viewpoint" pos="279 20 16 16" />
<rect id="vulcan" pos="315 25 9 8" />
<rect id="windmill" pos="310 2 13 19" />
</atlas>
Binary file added vtm-themes/resources/assets/icons/osm.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vtm-themes/resources/assets/icons/osmarender.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions vtm-themes/resources/assets/styles/default.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@
<style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
<style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />


<atlas img="styles/osm.png">
<atlas img="icons/osm.png">
<rect id="airport" pos="1 40 16 16" />
<rect id="atm" pos="19 40 16 16" />
<rect id="bar" pos="1 80 20 20" />
Expand Down
2 changes: 1 addition & 1 deletion vtm-themes/resources/assets/styles/newtron.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<style-line cap="butt" fix="true" id="building" stroke="#303030" width="1.0" />
<style-area fade="15" fill="#ee202020" id="building" />

<atlas img="styles/osmarender.png">
<atlas img="icons/osmarender.png">
<rect id="airport" pos="226 38 24 24" />
<rect id="alpine_hut" pos="198 41 26 21" />
<rect id="atm" pos="279 2 14 16" />
Expand Down
2 changes: 1 addition & 1 deletion vtm-themes/resources/assets/styles/osmarender.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<style-text style="bold" id="highway-track" k="name" size="16" stroke="#fff2de"
stroke-width="2.0" />

<atlas img="styles/osmarender.png">
<atlas img="icons/osmarender.png">
<rect id="airport" pos="226 38 24 24" />
<rect id="alpine_hut" pos="198 41 26 21" />
<rect id="atm" pos="279 2 14 16" />
Expand Down
2 changes: 1 addition & 1 deletion vtm-themes/resources/assets/styles/tronrender.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<style-line cap="butt" fix="true" id="building" stroke="#dd888888" width="1.5" />
<style-area fade="15" fill="#ee202020" id="building" />

<atlas img="styles/osmarender.png">
<atlas img="icons/osmarender.png">
<rect id="airport" pos="226 38 24 24" />
<rect id="alpine_hut" pos="198 41 26 21" />
<rect id="atm" pos="279 2 14 16" />
Expand Down
Loading

0 comments on commit ba00a53

Please sign in to comment.