diff --git a/map/README.md b/map/README.md index 13a7ff79d..7f301f250 100644 --- a/map/README.md +++ b/map/README.md @@ -91,13 +91,6 @@ You can use it to edit the style and see the changes live. }, ``` -```diff - }, -- "sprite": "{style}", -+ "sprite": "https://nav.tum.de/maps/styles/osm-liberty/sprite", - "glyphs": "https://nav.tum.de/tiles/font/{fontstack}/{range}", -``` - To edit the style you thus need to run maputnik and tileserver-gl at the same time. Change the style to the version maputnik expects. You cannot preview the style in tileserver-gl, but you can see the changes in maputnik. diff --git a/map/config.json b/map/config.json index 3f687ace0..149b1acd6 100644 --- a/map/config.json +++ b/map/config.json @@ -7,14 +7,24 @@ "styles": "styles", "mbtiles": "" }, - "domains": ["nav.tum.de", "localhost:8080", "127.0.0.1:8080"], + "domains": [ + "nav.tum.de", + "localhost:8080", + "127.0.0.1:8080" + ], "formatQuality": { "jpeg": 80, "webp": 90 }, "maxScaleFactor": 2, - "minRendererPoolSizes": [2, 4], - "maxRendererPoolSizes": [2, 4], + "minRendererPoolSizes": [ + 2, + 4 + ], + "maxRendererPoolSizes": [ + 2, + 4 + ], "maxSize": 2048, "pbfAlias": "pbf", "serveAllFonts": true, @@ -23,8 +33,8 @@ "tileMargin": 0 }, "styles": { - "osm-liberty": { - "style": "osm-liberty.json", + "navigatum-basemap": { + "style": "navigatum-basemap.json", "serve_rendered": true, "serve_data": true, "tilejson": { diff --git a/map/sprites/osm-liberty.json b/map/sprites/osm-liberty.json deleted file mode 100644 index c406ff658..000000000 --- a/map/sprites/osm-liberty.json +++ /dev/null @@ -1,1710 +0,0 @@ -{ - "aerialway": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 126, - "y": 190 - }, - "aerialway_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 337, - "y": 148 - }, - "airfield": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 145, - "y": 190 - }, - "airfield_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 352, - "y": 148 - }, - "airport": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 164, - "y": 190 - }, - "airport_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 367, - "y": 148 - }, - "alcohol_shop": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 64, - "y": 0 - }, - "alcohol_shop_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 413, - "y": 211 - }, - "american_football": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 85, - "y": 0 - }, - "american_football_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 430, - "y": 211 - }, - "amusement_park": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 106, - "y": 0 - }, - "amusement_park_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 447, - "y": 211 - }, - "aquarium": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 0, - "y": 64 - }, - "aquarium_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 464, - "y": 211 - }, - "arrow": { - "height": 7, - "pixelRatio": 1, - "width": 10, - "x": 294, - "y": 190 - }, - "art_gallery": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 21, - "y": 64 - }, - "art_gallery_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 481, - "y": 211 - }, - "attraction": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 42, - "y": 64 - }, - "attraction_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 252, - "y": 230 - }, - "bakery": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 63, - "y": 64 - }, - "bakery_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 269, - "y": 230 - }, - "bank": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 84, - "y": 64 - }, - "bank_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 286, - "y": 230 - }, - "bar": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 105, - "y": 64 - }, - "bar_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 303, - "y": 230 - }, - "baseball": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 0, - "y": 85 - }, - "baseball_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 320, - "y": 230 - }, - "basketball": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 21, - "y": 85 - }, - "basketball_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 337, - "y": 230 - }, - "beer": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 42, - "y": 85 - }, - "beer_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 354, - "y": 230 - }, - "bicycle": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 63, - "y": 85 - }, - "bicycle_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 371, - "y": 230 - }, - "bicycle_rental": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 84, - "y": 85 - }, - "bicycle_rental_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 388, - "y": 230 - }, - "building": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 183, - "y": 190 - }, - "building_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 382, - "y": 148 - }, - "bus": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 202, - "y": 190 - }, - "bus_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 397, - "y": 148 - }, - "butcher": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 105, - "y": 85 - }, - "butcher_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 405, - "y": 230 - }, - "cafe": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 0, - "y": 106 - }, - "cafe_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 422, - "y": 230 - }, - "campsite": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 21, - "y": 106 - }, - "campsite_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 439, - "y": 230 - }, - "car": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 221, - "y": 190 - }, - "car_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 412, - "y": 148 - }, - "castle": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 42, - "y": 106 - }, - "castle_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 456, - "y": 230 - }, - "cemetery": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 63, - "y": 106 - }, - "cemetery_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 473, - "y": 230 - }, - "cinema": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 84, - "y": 106 - }, - "cinema_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 490, - "y": 230 - }, - "circle": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 0, - "y": 211 - }, - "circle_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 427, - "y": 148 - }, - "circle_stroked": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 19, - "y": 211 - }, - "circle_stroked_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 442, - "y": 148 - }, - "clothing_store": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 105, - "y": 106 - }, - "clothing_store_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 252, - "y": 64 - }, - "college": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 126, - "y": 64 - }, - "college_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 269, - "y": 64 - }, - "commercial": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 38, - "y": 211 - }, - "commercial_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 457, - "y": 148 - }, - "cricket": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 147, - "y": 64 - }, - "cricket_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 286, - "y": 64 - }, - "cross": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 57, - "y": 211 - }, - "cross_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 472, - "y": 148 - }, - "dam": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 76, - "y": 211 - }, - "dam_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 487, - "y": 148 - }, - "danger": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 168, - "y": 64 - }, - "danger_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 303, - "y": 64 - }, - "default_1": { - "height": 18, - "pixelRatio": 1, - "width": 18, - "x": 209, - "y": 230 - }, - "default_2": { - "height": 18, - "pixelRatio": 1, - "width": 25, - "x": 227, - "y": 230 - }, - "default_3": { - "height": 18, - "pixelRatio": 1, - "width": 32, - "x": 247, - "y": 211 - }, - "default_4": { - "height": 18, - "pixelRatio": 1, - "width": 39, - "x": 279, - "y": 211 - }, - "default_5": { - "height": 18, - "pixelRatio": 1, - "width": 45, - "x": 318, - "y": 211 - }, - "default_6": { - "height": 18, - "pixelRatio": 1, - "width": 50, - "x": 363, - "y": 211 - }, - "dentist": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 189, - "y": 64 - }, - "dentist_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 320, - "y": 64 - }, - "doctors": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 210, - "y": 64 - }, - "doctors_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 337, - "y": 64 - }, - "dog_park": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 231, - "y": 64 - }, - "dog_park_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 354, - "y": 64 - }, - "dot_10": { - "height": 10, - "pixelRatio": 1, - "width": 10, - "x": 502, - "y": 148 - }, - "dot_11": { - "height": 11, - "pixelRatio": 1, - "width": 11, - "x": 498, - "y": 211 - }, - "dot_9": { - "height": 9, - "pixelRatio": 1, - "width": 9, - "x": 285, - "y": 190 - }, - "drinking_water": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 126, - "y": 85 - }, - "drinking_water_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 371, - "y": 64 - }, - "embassy": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 147, - "y": 85 - }, - "embassy_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 388, - "y": 64 - }, - "entrance": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 95, - "y": 211 - }, - "entrance_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 252, - "y": 169 - }, - "fast_food": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 168, - "y": 85 - }, - "fast_food_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 405, - "y": 64 - }, - "ferry": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 114, - "y": 211 - }, - "ferry_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 267, - "y": 169 - }, - "fire_station": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 189, - "y": 85 - }, - "fire_station_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 422, - "y": 64 - }, - "florist": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 210, - "y": 85 - }, - "fuel": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 133, - "y": 211 - }, - "fuel_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 282, - "y": 169 - }, - "furniture": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 231, - "y": 85 - }, - "garden": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 126, - "y": 106 - }, - "garden_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 439, - "y": 64 - }, - "gift": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 147, - "y": 106 - }, - "gift_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 456, - "y": 64 - }, - "golf": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 168, - "y": 106 - }, - "golf_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 473, - "y": 64 - }, - "grocery": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 189, - "y": 106 - }, - "grocery_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 490, - "y": 64 - }, - "hairdresser": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 210, - "y": 106 - }, - "hairdresser_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 252, - "y": 85 - }, - "harbor": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 152, - "y": 211 - }, - "harbor_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 297, - "y": 169 - }, - "heart": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 231, - "y": 106 - }, - "heart_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 269, - "y": 85 - }, - "heliport": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 171, - "y": 211 - }, - "heliport_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 312, - "y": 169 - }, - "hospital": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 127, - "y": 0 - }, - "hospital_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 286, - "y": 85 - }, - "ice_cream": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 148, - "y": 0 - }, - "ice_cream_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 303, - "y": 85 - }, - "industry": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 190, - "y": 211 - }, - "industry_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 327, - "y": 169 - }, - "information": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 169, - "y": 0 - }, - "information_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 320, - "y": 85 - }, - "laundry": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 190, - "y": 0 - }, - "laundry_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 337, - "y": 85 - }, - "library": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 211, - "y": 0 - }, - "library_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 354, - "y": 85 - }, - "lighthouse": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 232, - "y": 0 - }, - "lighthouse_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 371, - "y": 85 - }, - "lodging": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 0, - "y": 127 - }, - "lodging_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 388, - "y": 85 - }, - "marker": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 209, - "y": 211 - }, - "marker_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 342, - "y": 169 - }, - "monument": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 21, - "y": 127 - }, - "monument_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 405, - "y": 85 - }, - "mountain": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 42, - "y": 127 - }, - "mountain_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 422, - "y": 85 - }, - "museum": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 63, - "y": 127 - }, - "museum_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 439, - "y": 85 - }, - "music": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 84, - "y": 127 - }, - "music_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 456, - "y": 85 - }, - "park": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 105, - "y": 127 - }, - "park_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 473, - "y": 85 - }, - "parking": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 228, - "y": 211 - }, - "parking_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 357, - "y": 169 - }, - "parking_garage": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 0, - "y": 230 - }, - "parking_garage_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 372, - "y": 169 - }, - "pedestrian_polygon": { - "height": 64, - "pixelRatio": 1, - "width": 64, - "x": 0, - "y": 0 - }, - "pharmacy": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 126, - "y": 127 - }, - "pharmacy_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 490, - "y": 85 - }, - "picnic_site": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 147, - "y": 127 - }, - "picnic_site_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 252, - "y": 106 - }, - "pitch": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 168, - "y": 127 - }, - "pitch_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 269, - "y": 106 - }, - "place_of_worship": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 189, - "y": 127 - }, - "place_of_worship_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 286, - "y": 106 - }, - "playground": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 210, - "y": 127 - }, - "playground_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 303, - "y": 106 - }, - "police": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 231, - "y": 127 - }, - "police_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 320, - "y": 106 - }, - "post": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 0, - "y": 148 - }, - "post_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 337, - "y": 106 - }, - "prison": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 21, - "y": 148 - }, - "prison_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 354, - "y": 106 - }, - "railway": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 19, - "y": 230 - }, - "railway_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 387, - "y": 169 - }, - "railway_light": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 38, - "y": 230 - }, - "railway_light_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 402, - "y": 169 - }, - "railway_metro": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 57, - "y": 230 - }, - "railway_metro_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 417, - "y": 169 - }, - "ranger_station": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 42, - "y": 148 - }, - "ranger_station_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 371, - "y": 106 - }, - "religious_christian": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 63, - "y": 148 - }, - "religious_christian_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 388, - "y": 106 - }, - "religious_jewish": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 84, - "y": 148 - }, - "religious_jewish_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 405, - "y": 106 - }, - "religious_muslim": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 105, - "y": 148 - }, - "religious_muslim_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 422, - "y": 106 - }, - "restaurant": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 126, - "y": 148 - }, - "restaurant_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 439, - "y": 106 - }, - "roadblock": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 147, - "y": 148 - }, - "roadblock_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 456, - "y": 106 - }, - "rocket": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 168, - "y": 148 - }, - "rocket_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 473, - "y": 106 - }, - "school": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 189, - "y": 148 - }, - "school_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 490, - "y": 106 - }, - "shelter": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 210, - "y": 148 - }, - "shelter_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 252, - "y": 127 - }, - "shop": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 231, - "y": 148 - }, - "shop_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 269, - "y": 127 - }, - "skiing": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 0, - "y": 169 - }, - "skiing_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 286, - "y": 127 - }, - "soccer": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 21, - "y": 169 - }, - "soccer_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 303, - "y": 127 - }, - "square": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 76, - "y": 230 - }, - "square_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 432, - "y": 169 - }, - "square_stroked": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 95, - "y": 230 - }, - "square_stroked_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 447, - "y": 169 - }, - "stadium": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 42, - "y": 169 - }, - "stadium_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 320, - "y": 127 - }, - "star": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 114, - "y": 230 - }, - "star_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 462, - "y": 169 - }, - "star_stroked": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 133, - "y": 230 - }, - "star_stroked_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 477, - "y": 169 - }, - "suitcase": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 63, - "y": 169 - }, - "suitcase_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 337, - "y": 127 - }, - "sushi": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 84, - "y": 169 - }, - "sushi_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 354, - "y": 127 - }, - "swimming": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 105, - "y": 169 - }, - "swimming_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 371, - "y": 127 - }, - "telephone": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 126, - "y": 169 - }, - "telephone_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 388, - "y": 127 - }, - "tennis": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 147, - "y": 169 - }, - "tennis_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 405, - "y": 127 - }, - "theatre": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 168, - "y": 169 - }, - "theatre_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 422, - "y": 127 - }, - "toilets": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 189, - "y": 169 - }, - "toilets_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 439, - "y": 127 - }, - "town_hall": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 210, - "y": 169 - }, - "town_hall_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 456, - "y": 127 - }, - "triangle": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 152, - "y": 230 - }, - "triangle_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 492, - "y": 169 - }, - "triangle_stroked": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 171, - "y": 230 - }, - "triangle_stroked_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 240, - "y": 190 - }, - "veterinary": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 231, - "y": 169 - }, - "veterinary_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 473, - "y": 127 - }, - "volcano": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 0, - "y": 190 - }, - "volcano_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 490, - "y": 127 - }, - "warehouse": { - "height": 19, - "pixelRatio": 1, - "width": 19, - "x": 190, - "y": 230 - }, - "warehouse_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 255, - "y": 190 - }, - "waste_basket": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 21, - "y": 190 - }, - "waste_basket_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 252, - "y": 148 - }, - "water": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 42, - "y": 190 - }, - "water_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 269, - "y": 148 - }, - "wetland": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 63, - "y": 190 - }, - "wetland_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 286, - "y": 148 - }, - "wetland_bg_11": { - "height": 15, - "pixelRatio": 1, - "width": 15, - "x": 270, - "y": 190 - }, - "wheelchair": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 84, - "y": 190 - }, - "wheelchair_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 303, - "y": 148 - }, - "zoo": { - "height": 21, - "pixelRatio": 1, - "width": 21, - "x": 105, - "y": 190 - }, - "zoo_11": { - "height": 17, - "pixelRatio": 1, - "width": 17, - "x": 320, - "y": 148 - } -} diff --git a/map/sprites/osm-liberty.png b/map/sprites/osm-liberty.png deleted file mode 100644 index 9f65d359d..000000000 Binary files a/map/sprites/osm-liberty.png and /dev/null differ diff --git a/map/sprites/osm-liberty@2x.json b/map/sprites/osm-liberty@2x.json deleted file mode 100644 index 3b47955d9..000000000 --- a/map/sprites/osm-liberty@2x.json +++ /dev/null @@ -1,1710 +0,0 @@ -{ - "aerialway": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 252, - "y": 380 - }, - "aerialway_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 674, - "y": 296 - }, - "airfield": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 290, - "y": 380 - }, - "airfield_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 704, - "y": 296 - }, - "airport": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 328, - "y": 380 - }, - "airport_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 734, - "y": 296 - }, - "alcohol_shop": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 128, - "y": 0 - }, - "alcohol_shop_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 826, - "y": 422 - }, - "american_football": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 170, - "y": 0 - }, - "american_football_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 860, - "y": 422 - }, - "amusement_park": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 212, - "y": 0 - }, - "amusement_park_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 894, - "y": 422 - }, - "aquarium": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 0, - "y": 128 - }, - "aquarium_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 928, - "y": 422 - }, - "arrow": { - "height": 14, - "pixelRatio": 2, - "width": 20, - "x": 588, - "y": 380 - }, - "art_gallery": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 42, - "y": 128 - }, - "art_gallery_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 962, - "y": 422 - }, - "attraction": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 84, - "y": 128 - }, - "attraction_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 504, - "y": 460 - }, - "bakery": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 126, - "y": 128 - }, - "bakery_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 538, - "y": 460 - }, - "bank": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 168, - "y": 128 - }, - "bank_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 572, - "y": 460 - }, - "bar": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 210, - "y": 128 - }, - "bar_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 606, - "y": 460 - }, - "baseball": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 0, - "y": 170 - }, - "baseball_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 640, - "y": 460 - }, - "basketball": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 42, - "y": 170 - }, - "basketball_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 674, - "y": 460 - }, - "beer": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 84, - "y": 170 - }, - "beer_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 708, - "y": 460 - }, - "bicycle": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 126, - "y": 170 - }, - "bicycle_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 742, - "y": 460 - }, - "bicycle_rental": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 168, - "y": 170 - }, - "bicycle_rental_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 776, - "y": 460 - }, - "building": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 366, - "y": 380 - }, - "building_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 764, - "y": 296 - }, - "bus": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 404, - "y": 380 - }, - "bus_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 794, - "y": 296 - }, - "butcher": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 210, - "y": 170 - }, - "butcher_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 810, - "y": 460 - }, - "cafe": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 0, - "y": 212 - }, - "cafe_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 844, - "y": 460 - }, - "campsite": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 42, - "y": 212 - }, - "campsite_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 878, - "y": 460 - }, - "car": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 442, - "y": 380 - }, - "car_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 824, - "y": 296 - }, - "castle": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 84, - "y": 212 - }, - "castle_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 912, - "y": 460 - }, - "cemetery": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 126, - "y": 212 - }, - "cemetery_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 946, - "y": 460 - }, - "cinema": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 168, - "y": 212 - }, - "cinema_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 980, - "y": 460 - }, - "circle": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 0, - "y": 422 - }, - "circle_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 854, - "y": 296 - }, - "circle_stroked": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 38, - "y": 422 - }, - "circle_stroked_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 884, - "y": 296 - }, - "clothing_store": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 210, - "y": 212 - }, - "clothing_store_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 504, - "y": 128 - }, - "college": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 252, - "y": 128 - }, - "college_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 538, - "y": 128 - }, - "commercial": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 76, - "y": 422 - }, - "commercial_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 914, - "y": 296 - }, - "cricket": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 294, - "y": 128 - }, - "cricket_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 572, - "y": 128 - }, - "cross": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 114, - "y": 422 - }, - "cross_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 944, - "y": 296 - }, - "dam": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 152, - "y": 422 - }, - "dam_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 974, - "y": 296 - }, - "danger": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 336, - "y": 128 - }, - "danger_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 606, - "y": 128 - }, - "default_1": { - "height": 36, - "pixelRatio": 2, - "width": 36, - "x": 418, - "y": 460 - }, - "default_2": { - "height": 36, - "pixelRatio": 2, - "width": 50, - "x": 454, - "y": 460 - }, - "default_3": { - "height": 36, - "pixelRatio": 2, - "width": 64, - "x": 494, - "y": 422 - }, - "default_4": { - "height": 36, - "pixelRatio": 2, - "width": 78, - "x": 558, - "y": 422 - }, - "default_5": { - "height": 36, - "pixelRatio": 2, - "width": 90, - "x": 636, - "y": 422 - }, - "default_6": { - "height": 36, - "pixelRatio": 2, - "width": 100, - "x": 726, - "y": 422 - }, - "dentist": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 378, - "y": 128 - }, - "dentist_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 640, - "y": 128 - }, - "doctors": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 420, - "y": 128 - }, - "doctors_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 674, - "y": 128 - }, - "dog_park": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 462, - "y": 128 - }, - "dog_park_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 708, - "y": 128 - }, - "dot_10": { - "height": 20, - "pixelRatio": 2, - "width": 20, - "x": 1004, - "y": 296 - }, - "dot_11": { - "height": 22, - "pixelRatio": 2, - "width": 22, - "x": 996, - "y": 422 - }, - "dot_9": { - "height": 18, - "pixelRatio": 2, - "width": 18, - "x": 570, - "y": 380 - }, - "drinking_water": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 252, - "y": 170 - }, - "drinking_water_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 742, - "y": 128 - }, - "embassy": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 294, - "y": 170 - }, - "embassy_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 776, - "y": 128 - }, - "entrance": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 190, - "y": 422 - }, - "entrance_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 504, - "y": 338 - }, - "fast_food": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 336, - "y": 170 - }, - "fast_food_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 810, - "y": 128 - }, - "ferry": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 228, - "y": 422 - }, - "ferry_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 534, - "y": 338 - }, - "fire_station": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 378, - "y": 170 - }, - "fire_station_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 844, - "y": 128 - }, - "florist": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 420, - "y": 170 - }, - "fuel": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 266, - "y": 422 - }, - "fuel_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 564, - "y": 338 - }, - "furniture": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 462, - "y": 170 - }, - "garden": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 252, - "y": 212 - }, - "garden_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 878, - "y": 128 - }, - "gift": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 294, - "y": 212 - }, - "gift_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 912, - "y": 128 - }, - "golf": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 336, - "y": 212 - }, - "golf_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 946, - "y": 128 - }, - "grocery": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 378, - "y": 212 - }, - "grocery_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 980, - "y": 128 - }, - "hairdresser": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 420, - "y": 212 - }, - "hairdresser_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 504, - "y": 170 - }, - "harbor": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 304, - "y": 422 - }, - "harbor_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 594, - "y": 338 - }, - "heart": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 462, - "y": 212 - }, - "heart_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 538, - "y": 170 - }, - "heliport": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 342, - "y": 422 - }, - "heliport_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 624, - "y": 338 - }, - "hospital": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 254, - "y": 0 - }, - "hospital_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 572, - "y": 170 - }, - "ice_cream": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 296, - "y": 0 - }, - "ice_cream_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 606, - "y": 170 - }, - "industry": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 380, - "y": 422 - }, - "industry_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 654, - "y": 338 - }, - "information": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 338, - "y": 0 - }, - "information_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 640, - "y": 170 - }, - "laundry": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 380, - "y": 0 - }, - "laundry_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 674, - "y": 170 - }, - "library": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 422, - "y": 0 - }, - "library_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 708, - "y": 170 - }, - "lighthouse": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 464, - "y": 0 - }, - "lighthouse_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 742, - "y": 170 - }, - "lodging": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 0, - "y": 254 - }, - "lodging_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 776, - "y": 170 - }, - "marker": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 418, - "y": 422 - }, - "marker_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 684, - "y": 338 - }, - "monument": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 42, - "y": 254 - }, - "monument_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 810, - "y": 170 - }, - "mountain": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 84, - "y": 254 - }, - "mountain_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 844, - "y": 170 - }, - "museum": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 126, - "y": 254 - }, - "museum_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 878, - "y": 170 - }, - "music": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 168, - "y": 254 - }, - "music_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 912, - "y": 170 - }, - "park": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 210, - "y": 254 - }, - "park_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 946, - "y": 170 - }, - "parking": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 456, - "y": 422 - }, - "parking_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 714, - "y": 338 - }, - "parking_garage": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 0, - "y": 460 - }, - "parking_garage_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 744, - "y": 338 - }, - "pedestrian_polygon": { - "height": 128, - "pixelRatio": 2, - "width": 128, - "x": 0, - "y": 0 - }, - "pharmacy": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 252, - "y": 254 - }, - "pharmacy_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 980, - "y": 170 - }, - "picnic_site": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 294, - "y": 254 - }, - "picnic_site_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 504, - "y": 212 - }, - "pitch": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 336, - "y": 254 - }, - "pitch_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 538, - "y": 212 - }, - "place_of_worship": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 378, - "y": 254 - }, - "place_of_worship_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 572, - "y": 212 - }, - "playground": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 420, - "y": 254 - }, - "playground_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 606, - "y": 212 - }, - "police": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 462, - "y": 254 - }, - "police_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 640, - "y": 212 - }, - "post": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 0, - "y": 296 - }, - "post_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 674, - "y": 212 - }, - "prison": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 42, - "y": 296 - }, - "prison_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 708, - "y": 212 - }, - "railway": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 38, - "y": 460 - }, - "railway_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 774, - "y": 338 - }, - "railway_light": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 76, - "y": 460 - }, - "railway_light_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 804, - "y": 338 - }, - "railway_metro": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 114, - "y": 460 - }, - "railway_metro_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 834, - "y": 338 - }, - "ranger_station": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 84, - "y": 296 - }, - "ranger_station_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 742, - "y": 212 - }, - "religious_christian": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 126, - "y": 296 - }, - "religious_christian_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 776, - "y": 212 - }, - "religious_jewish": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 168, - "y": 296 - }, - "religious_jewish_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 810, - "y": 212 - }, - "religious_muslim": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 210, - "y": 296 - }, - "religious_muslim_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 844, - "y": 212 - }, - "restaurant": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 252, - "y": 296 - }, - "restaurant_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 878, - "y": 212 - }, - "roadblock": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 294, - "y": 296 - }, - "roadblock_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 912, - "y": 212 - }, - "rocket": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 336, - "y": 296 - }, - "rocket_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 946, - "y": 212 - }, - "school": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 378, - "y": 296 - }, - "school_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 980, - "y": 212 - }, - "shelter": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 420, - "y": 296 - }, - "shelter_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 504, - "y": 254 - }, - "shop": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 462, - "y": 296 - }, - "shop_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 538, - "y": 254 - }, - "skiing": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 0, - "y": 338 - }, - "skiing_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 572, - "y": 254 - }, - "soccer": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 42, - "y": 338 - }, - "soccer_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 606, - "y": 254 - }, - "square": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 152, - "y": 460 - }, - "square_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 864, - "y": 338 - }, - "square_stroked": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 190, - "y": 460 - }, - "square_stroked_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 894, - "y": 338 - }, - "stadium": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 84, - "y": 338 - }, - "stadium_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 640, - "y": 254 - }, - "star": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 228, - "y": 460 - }, - "star_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 924, - "y": 338 - }, - "star_stroked": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 266, - "y": 460 - }, - "star_stroked_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 954, - "y": 338 - }, - "suitcase": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 126, - "y": 338 - }, - "suitcase_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 674, - "y": 254 - }, - "sushi": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 168, - "y": 338 - }, - "sushi_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 708, - "y": 254 - }, - "swimming": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 210, - "y": 338 - }, - "swimming_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 742, - "y": 254 - }, - "telephone": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 252, - "y": 338 - }, - "telephone_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 776, - "y": 254 - }, - "tennis": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 294, - "y": 338 - }, - "tennis_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 810, - "y": 254 - }, - "theatre": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 336, - "y": 338 - }, - "theatre_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 844, - "y": 254 - }, - "toilets": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 378, - "y": 338 - }, - "toilets_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 878, - "y": 254 - }, - "town_hall": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 420, - "y": 338 - }, - "town_hall_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 912, - "y": 254 - }, - "triangle": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 304, - "y": 460 - }, - "triangle_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 984, - "y": 338 - }, - "triangle_stroked": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 342, - "y": 460 - }, - "triangle_stroked_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 480, - "y": 380 - }, - "veterinary": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 462, - "y": 338 - }, - "veterinary_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 946, - "y": 254 - }, - "volcano": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 0, - "y": 380 - }, - "volcano_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 980, - "y": 254 - }, - "warehouse": { - "height": 38, - "pixelRatio": 2, - "width": 38, - "x": 380, - "y": 460 - }, - "warehouse_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 510, - "y": 380 - }, - "waste_basket": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 42, - "y": 380 - }, - "waste_basket_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 504, - "y": 296 - }, - "water": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 84, - "y": 380 - }, - "water_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 538, - "y": 296 - }, - "wetland": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 126, - "y": 380 - }, - "wetland_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 572, - "y": 296 - }, - "wetland_bg_11": { - "height": 30, - "pixelRatio": 2, - "width": 30, - "x": 540, - "y": 380 - }, - "wheelchair": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 168, - "y": 380 - }, - "wheelchair_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 606, - "y": 296 - }, - "zoo": { - "height": 42, - "pixelRatio": 2, - "width": 42, - "x": 210, - "y": 380 - }, - "zoo_11": { - "height": 34, - "pixelRatio": 2, - "width": 34, - "x": 640, - "y": 296 - } -} diff --git a/map/sprites/osm-liberty@2x.png b/map/sprites/osm-liberty@2x.png deleted file mode 100644 index 021ad2015..000000000 Binary files a/map/sprites/osm-liberty@2x.png and /dev/null differ diff --git a/map/styles/osm-liberty.json b/map/styles/navigatum-basemap.json similarity index 99% rename from map/styles/osm-liberty.json rename to map/styles/navigatum-basemap.json index 7bfe207a4..9144f4849 100644 --- a/map/styles/osm-liberty.json +++ b/map/styles/navigatum-basemap.json @@ -4768,5 +4768,5 @@ } } ], - "id": "osm-liberty" + "id": "navigatum-basemap" } diff --git a/server/src/maps/fetch_tile.rs b/server/src/maps/fetch_tile.rs index 7036a6359..69b923224 100644 --- a/server/src/maps/fetch_tile.rs +++ b/server/src/maps/fetch_tile.rs @@ -96,7 +96,7 @@ impl FetchTileTask { #[tracing::instrument] async fn download_map_image(location: TileLocation) -> anyhow::Result> { let url = format!( - "https://nav.tum.de/maps/styles/osm-liberty/{z}/{x}/{y}@2x.png", + "https://nav.tum.de/maps/styles/navigatum-basemap/{z}/{x}/{y}@2x.png", x = location.x, y = location.y, z = location.z diff --git a/webclient/app/components/DetailsInteractiveMap.vue b/webclient/app/components/DetailsInteractiveMap.vue index abad462e1..293d0da4e 100644 --- a/webclient/app/components/DetailsInteractiveMap.vue +++ b/webclient/app/components/DetailsInteractiveMap.vue @@ -91,7 +91,7 @@ function initMap(containerId: string): Map { // preview of the following style is available at // https://nav.tum.de/maps/ - style: `${runtimeConfig.public.mapsURL}/maps/styles/osm-liberty/style.json`, + style: `${runtimeConfig.public.mapsURL}/maps/styles/navigatum-basemap/style.json`, center: [11.5748, 48.14], // Approx Munich zoom: 11, // Zoomed out so that the whole city is visible diff --git a/webclient/app/components/IndoorMap.vue b/webclient/app/components/IndoorMap.vue index adf07bc63..3db103eff 100644 --- a/webclient/app/components/IndoorMap.vue +++ b/webclient/app/components/IndoorMap.vue @@ -90,7 +90,7 @@ async function initMap(containerId: string): Promise { // preview of the following style is available at // https://nav.tum.de/maps/ - style: `${runtimeConfig.public.mapsURL}/maps/styles/osm-liberty/style.json`, + style: `${runtimeConfig.public.mapsURL}/maps/styles/navigatum-basemap/style.json`, center: [11.670028798993783, 48.26684628456347], // Approx Garching zoom: 11, // Zoomed out so that the whole city is visible