diff --git a/.env b/.env index 29a0fca..ee2420e 100644 --- a/.env +++ b/.env @@ -16,8 +16,8 @@ PGPORT=5432 # BBOX may get overwritten by the computed bbox of the specific area: # make generate-bbox-file # By default, the Makefile will use the content of data/$(area).bbox file if it exists. -#BBOX=2.255544,49.857797,6.586904,51.389246 -#BBOX=2.255544,49.857797,6.586904,51.389246 +#BBOX=4.964926,50.882471,5.411252,51.071236 +#BBOX=4.964926,50.882471,5.411252,51.071236 # Which zooms to generate with make generate-tiles-pg diff --git a/MIEL-open-issues.md b/MIEL-open-issues.md new file mode 100644 index 0000000..81019bf --- /dev/null +++ b/MIEL-open-issues.md @@ -0,0 +1,15 @@ + +#### amenity: parking_entrance +is nog niet covered: +https://www.openstreetmap.org/node/3192139608 +http://localhost:8080/styles/light/?vector#18.53/50.8813949/4.707086 + +### While we're at it, add trees +As a near-max zoom level thing only. +https://www.openstreetmap.org/node/3192142615 +Would need to be a new layer to style correctly, +and other such 'decorations' could be considered. +(currently, bins, park-benches, etc are considered regular POI while these +would fit in their own 'low-rank' category) + +![miel_screenshot.png](miel_screenshot.png) \ No newline at end of file diff --git a/layers/boundary/nuts.sql b/layers/boundary/nuts.sql index 210d877..5680ed9 100644 --- a/layers/boundary/nuts.sql +++ b/layers/boundary/nuts.sql @@ -4,7 +4,7 @@ DO $$ BEGIN - DROP TABLE IF EXISTS osm_boundary_polygon CASCADE; + DROP TABLE IF EXISTS osm_boundary_polygon_nuts CASCADE; EXCEPTION WHEN wrong_object_type THEN END; @@ -12,8 +12,8 @@ $$ LANGUAGE plpgsql; -- etldoc: osm_border_linestring -> osm_border_linestring_gen_z13 -- etldoc: osm_border_linestring_adm -> osm_border_linestring_gen_z13 -DROP MATERIALIZED VIEW IF EXISTS osm_boundary_polygon CASCADE; -CREATE MATERIALIZED VIEW osm_boundary_polygon AS +DROP MATERIALIZED VIEW IF EXISTS osm_boundary_polygon_nuts CASCADE; +CREATE MATERIALIZED VIEW osm_boundary_polygon_nuts AS ( SELECT r.osm_id as relation_id, r.name, @@ -33,7 +33,7 @@ FROM ( ) as p LEFT JOIN osm_administrative_relation as r on r.osm_id = p.relation_id ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ; -CREATE INDEX IF NOT EXISTS osm_boundary_polygon_idx ON osm_boundary_polygon USING gist (geometry); +CREATE INDEX IF NOT EXISTS osm_boundary_polygon_idx ON osm_boundary_polygon_nuts USING gist (geometry); -- etldoc: osm_border_linestring -> osm_border_linestring_gen_z13 @@ -117,7 +117,7 @@ FROM ( FROM osm_administrative_boundary as b INNER JOIN osm_administrative_member as m ON b.osm_id = m.boundary_id - INNER JOIN osm_boundary_polygon as r + INNER JOIN osm_boundary_polygon_nuts as r ON m.relation_id = r.relation_id ) as g GROUP BY osm_id, geometry diff --git a/layers/mountain_peak/style.json b/layers/mountain_peak/style.json index befc0f0..2e8b289 100644 --- a/layers/mountain_peak/style.json +++ b/layers/mountain_peak/style.json @@ -47,7 +47,7 @@ "text-halo-color": "rgba(255, 255, 255, .8)", "text-halo-width": 1 }, - "order": 197 + "order": 192 }, { "id": "mountain_peak_volcano", @@ -95,7 +95,7 @@ "text-halo-color": "rgba(255, 255, 255, .8)", "text-halo-width": 1 }, - "order": 198 + "order": 193 } ] } \ No newline at end of file diff --git a/layers/place/style.json b/layers/place/style.json index 07d9ba2..59eaa48 100644 --- a/layers/place/style.json +++ b/layers/place/style.json @@ -129,7 +129,7 @@ "village" ] ], - "order": 199 + "order": 194 }, { "id": "place_town", @@ -177,7 +177,7 @@ "town" ] ], - "order": 200 + "order": 195 }, { "id": "place_state", @@ -228,7 +228,7 @@ 3 ] ], - "order": 201 + "order": 196 }, { "id": "place_city", @@ -311,7 +311,7 @@ 1 ] ], - "order": 202 + "order": 197 }, { "id": "place_capital", @@ -396,7 +396,7 @@ 2 ] ], - "order": 203 + "order": 198 }, { "id": "country_other", @@ -449,7 +449,7 @@ "iso_a2" ] ], - "order": 204 + "order": 199 }, { "id": "country_3", @@ -518,7 +518,7 @@ "iso_a2" ] ], - "order": 205 + "order": 200 }, { "id": "country_2", @@ -587,7 +587,7 @@ "iso_a2" ] ], - "order": 206 + "order": 201 }, { "id": "country_1", @@ -656,7 +656,7 @@ "iso_a2" ] ], - "order": 207 + "order": 202 } ] } \ No newline at end of file diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml index c485024..7b7f9fc 100644 --- a/layers/poi/mapping.yaml +++ b/layers/poi/mapping.yaml @@ -107,7 +107,6 @@ def_poi_mapping_landuse: &poi_mapping_landuse def_poi_mapping_leisure: &poi_mapping_leisure - dog_park - escape_game - - garden - golf_course - ice_rink - hackerspace @@ -122,6 +121,14 @@ def_poi_mapping_leisure: &poi_mapping_leisure - swimming_pool - water_park - nature_reserve + - dance + - picnic_table + - outdoor_seating + - slipway + - resort + - marina + - fitness_centre + - fitness_station # office values , see http://taginfo.openstreetmap.org/keys/office#values def_poi_mapping_office: &poi_mapping_office diff --git a/layers/poi/poi.yaml b/layers/poi/poi.yaml index 8f917a6..4b0efa4 100644 --- a/layers/poi/poi.yaml +++ b/layers/poi/poi.yaml @@ -26,41 +26,41 @@ layer: 'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys', 'travel_agency', 'watches', 'weapons', 'wholesale' ] office: - subclass: ['accountant', 'advertising_agency', 'architect', 'association', 'bail_bond_agent', 'charity', - 'company', 'construction_company', 'consulting', 'cooperative', 'courier', 'coworking', 'diplomatic', - 'educational_institution', 'employment_agency', 'energy_supplier', 'engineer', 'estate_agent', 'financial', - 'financial_advisor', 'forestry', 'foundation', 'geodesist', 'government', 'graphic_design', 'guide', - 'harbour_master', 'health_insurance', 'insurance', 'interior_design', 'it', 'lawyer', 'logistics', 'marketing', - 'moving_company', 'newspaper', 'ngo', 'notary', 'physician', 'political_party', 'private_investigator', - 'property_management', 'publisher', 'quango', 'religion', 'research', 'security', 'surveyor', 'tax_advisor', - 'taxi', 'telecommunication', 'therapist', 'translator', 'travel_agent', 'tutoring', 'union', 'university', - 'water_utility', 'web_design', 'wedding_planner'] + subclass: [ 'accountant', 'advertising_agency', 'architect', 'association', 'bail_bond_agent', 'charity', + 'company', 'construction_company', 'consulting', 'cooperative', 'courier', 'coworking', 'diplomatic', + 'educational_institution', 'employment_agency', 'energy_supplier', 'engineer', 'estate_agent', 'financial', + 'financial_advisor', 'forestry', 'foundation', 'geodesist', 'government', 'graphic_design', 'guide', + 'harbour_master', 'health_insurance', 'insurance', 'interior_design', 'it', 'lawyer', 'logistics', 'marketing', + 'moving_company', 'newspaper', 'ngo', 'notary', 'physician', 'political_party', 'private_investigator', + 'property_management', 'publisher', 'quango', 'religion', 'research', 'security', 'surveyor', 'tax_advisor', + 'taxi', 'telecommunication', 'therapist', 'translator', 'travel_agent', 'tutoring', 'union', 'university', + 'water_utility', 'web_design', 'wedding_planner'] # optician: -# subclass: [ 'optician' ] -# toys: -# subclass: [ 'toys' ] -# jewelry: -# subclass: [ 'jewelry' ] -# furniture: -# subclass: [ 'furniture' ] -# newsagent: -# subclass: [ 'newsagent' ] -# paint: -# subclass: [ 'paint' ] -# beverages: -# subclass: [ 'beverages' ] -# electronics: -# subclass: [ 'electronics' ] -# garden_centre: -# subclass: [ 'garden_centre' ] -# mobile_phone: -# subclass: [ 'mobile_phone' ] -# shoes: -# subclass: [ 'shoes' ] -# hardware: -# subclass: [ 'hardware', 'doityourself' ] -# florist: -# subclass: [ 'florist' ] + # subclass: [ 'optician' ] + # toys: + # subclass: [ 'toys' ] + # jewelry: + # subclass: [ 'jewelry' ] + # furniture: + # subclass: [ 'furniture' ] + # newsagent: + # subclass: [ 'newsagent' ] + # paint: + # subclass: [ 'paint' ] + # beverages: + # subclass: [ 'beverages' ] + # electronics: + # subclass: [ 'electronics' ] + # garden_centre: + # subclass: [ 'garden_centre' ] + # mobile_phone: + # subclass: [ 'mobile_phone' ] + # shoes: + # subclass: [ 'shoes' ] + # hardware: + # subclass: [ 'hardware', 'doityourself' ] + # florist: + # subclass: [ 'florist' ] town_hall: subclass: ['townhall', 'public_building', 'courthouse'] community_centre: diff --git a/layers/transportation/style.json b/layers/transportation/style.json index 0a868bf..40196c3 100644 --- a/layers/transportation/style.json +++ b/layers/transportation/style.json @@ -7802,4 +7802,4 @@ "order": 178 } ] -} +} \ No newline at end of file diff --git a/miel_screenshot.png b/miel_screenshot.png new file mode 100644 index 0000000..f3ac5b4 Binary files /dev/null and b/miel_screenshot.png differ