From 35a2301ea366510793ea0cbfa47b285b65b1fe6b Mon Sep 17 00:00:00 2001 From: Tobias Jordans Date: Sun, 12 May 2019 19:31:23 +0200 Subject: [PATCH] Add filter building:part and indoor - Extract the building:part from the building filter into it's own filter - Add indoor filtering - Update api doc --- API.md | 2 +- data/core.yaml | 6 +++ dist/locales/en.json | 98 ++++++------------------------------ modules/renderer/features.js | 9 +++- 4 files changed, 29 insertions(+), 86 deletions(-) diff --git a/API.md b/API.md index 52a6a2ad9..c8c937a6f 100644 --- a/API.md +++ b/API.md @@ -19,7 +19,7 @@ of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters ar _Example:_ `comment=CAR%20crisis%2C%20refugee%20areas%20in%20Cameroon` * __`disable_features`__ - Disables features in the list.
_Example:_ `disable_features=water,service_roads,points,paths,boundaries`
- _Available features:_ `points` `traffic_roads` `service_roads` `paths` `buildings` `landuse` + _Available features:_ `points` `traffic_roads` `service_roads` `paths` `buildings` `building_parts` `indoor` `landuse` `boundaries` `water` `rail` `power` `past_future` `others` * __`gpx`__ - A custom URL for loading a gpx track. Specifying a `gpx` parameter will automatically enable the gpx layer for display.
diff --git a/data/core.yaml b/data/core.yaml index 921fc8487..9666cd2e8 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -628,6 +628,12 @@ en: buildings: description: Buildings tooltip: "Buildings, Shelters, Garages, etc." + building_parts: + description: Building Parts + tooltip: "building:part=*" + indoor: + description: Indoor + tooltip: "indoor=*" landuse: description: Landuse Features tooltip: "Forests, Farmland, Parks, Residential, Commercial, etc." diff --git a/dist/locales/en.json b/dist/locales/en.json index d11763369..61ce10445 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -782,6 +782,14 @@ "description": "Buildings", "tooltip": "Buildings, Shelters, Garages, etc." }, + "building_parts": { + "description": "Building Parts", + "tooltip": "building:part=*" + }, + "indoor": { + "description": "Indoor", + "tooltip": "indoor=*" + }, "landuse": { "description": "Landuse Features", "tooltip": "Forests, Farmland, Parks, Residential, Commercial, etc." @@ -9099,20 +9107,6 @@ "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.", "name": "DigitalGlobe Standard Imagery Vintage" }, - "DigitalGlobe-Vivid": { - "attribution": { - "text": "Terms & Feedback" - }, - "description": "DigitalGlobe-Vivid is a mosaic with optimal aesthetics and currency for any area on the globe, 50cm resolution or better, and image currency <20 month average globally.", - "name": "DigitalGlobe Vivid Imagery" - }, - "EOXAT2018CLOUDLESS": { - "attribution": { - "text": "Sentinel-2 cloudless - https://s2maps.eu by EOX IT Services GmbH (Contains modified Copernicus Sentinel data 2017 & 2018)" - }, - "description": "Post-processed Sentinel Satellite imagery.", - "name": "eox.at 2018 cloudless" - }, "EsriWorldImagery": { "attribution": { "text": "Terms & Feedback" @@ -9189,6 +9183,9 @@ "SPW_PICC": { "name": "SPW(allonie) PICC numerical imagery" }, + "US-TIGER-Roads-2012": { + "name": "TIGER Roads 2012" + }, "US-TIGER-Roads-2014": { "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap", "name": "TIGER Roads 2014" @@ -9197,10 +9194,6 @@ "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", "name": "TIGER Roads 2017" }, - "US-TIGER-Roads-2018": { - "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", - "name": "TIGER Roads 2018" - }, "US_Forest_Service_roads_overlay": { "description": "Highway: Green casing = unclassified. Brown casing = track. Surface: gravel = light brown fill, Asphalt = black, paved = gray, ground =white, concrete = blue, grass = green. Seasonal = white bars", "name": "U.S. Forest Roads Overlay" @@ -9217,12 +9210,6 @@ }, "name": "UrbIS-Ortho 2017" }, - "UrbISOrtho2018": { - "attribution": { - "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB" - }, - "name": "UrbIS-Ortho 2018" - }, "UrbisAdmFR": { "attribution": { "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB" @@ -9300,20 +9287,6 @@ "description": "Japan GSI ortho Imagery. Usually better than bing, but a bit older.", "name": "Japan GSI ortho Imagery" }, - "gsi.go.jp_airphoto": { - "attribution": { - "text": "GSI Japan" - }, - "description": "Japan GSI airphoto Imagery. Not fully orthorectified, but a bit newer and/or differently covered than GSI ortho Imagery.", - "name": "Japan GSI airphoto Imagery" - }, - "gsi.go.jp_seamlessphoto": { - "attribution": { - "text": "GSI Japan seamless photo" - }, - "description": "Japan GSI seamlessphoto Imagery. The collection of latest imageries of GSI ortho, airphoto, post disaster and others.", - "name": "Japan GSI seamlessphoto Imagery" - }, "gsi.go.jp_std_map": { "attribution": { "text": "GSI Japan" @@ -9321,33 +9294,11 @@ "description": "Japan GSI Standard Map. Widely covered.", "name": "Japan GSI Standard Map" }, - "helsingborg-orto": { + "hike_n_bike": { "attribution": { - "text": "© Helsingborg municipality" + "text": "© OpenStreetMap contributors" }, - "description": "Orthophotos from the municipality of Helsingborg 2016, public domain", - "name": "Helsingborg Orthophoto" - }, - "kalmar-orto-2014": { - "attribution": { - "text": "© Kalmar municipality" - }, - "description": "Orthophotos for the north coast of the municipality of Kalmar 2014", - "name": "Kalmar North Orthophoto 2014" - }, - "kalmar-orto-2016": { - "attribution": { - "text": "© Kalmar municipality" - }, - "description": "Orthophotos for the south coast of the municipality of Kalmar 2016", - "name": "Kalmar South Orthophoto 2016" - }, - "kalmar-orto-2018": { - "attribution": { - "text": "© Kalmar municipality" - }, - "description": "Orthophotos for urban areas of the municipality of Kalmar 2018", - "name": "Kalmar Urban Orthophoto 2018" + "name": "Hike & Bike" }, "kelkkareitit": { "attribution": { @@ -9370,20 +9321,6 @@ "description": "Mosaic of Swedish orthophotos from the period 1970–1980. Is under construction.", "name": "Lantmäteriet Historic Orthophoto 1975" }, - "lantmateriet-topowebb": { - "attribution": { - "text": "© Lantmäteriet, CC0" - }, - "description": "Topographic map of Sweden 1:50 000", - "name": "Lantmäteriet Topographic Map" - }, - "linkoping-orto": { - "attribution": { - "text": "© Linköping municipality" - }, - "description": "Orthophotos from the municipality of Linköping 2010, open data", - "name": "Linköping Orthophoto" - }, "mapbox_locator_overlay": { "attribution": { "text": "Terms & Feedback" @@ -9448,13 +9385,6 @@ }, "name": "Stamen Terrain" }, - "stockholm-orto": { - "attribution": { - "text": "© Stockholm municipality, CC0" - }, - "description": "Orthophotos from the municipality of Stockholm 2016, CC0 license", - "name": "Stockholm Orthophoto" - }, "tf-cycle": { "attribution": { "text": "Maps © Thunderforest, Data © OpenStreetMap contributors" diff --git a/modules/renderer/features.js b/modules/renderer/features.js index dba4cc7ef..d80bbff1c 100644 --- a/modules/renderer/features.js +++ b/modules/renderer/features.js @@ -119,7 +119,6 @@ export function rendererFeatures(context) { defineRule('buildings', function isBuilding(tags) { return ( - !!tags['building:part'] || (!!tags.building && tags.building !== 'no') || tags.parking === 'multi-storey' || tags.parking === 'sheds' || @@ -128,6 +127,14 @@ export function rendererFeatures(context) { ); }, 250); + defineRule('building_parts', function isBuildingPart(tags) { + return tags['building:part']; + }); + + defineRule('indoor', function isIndoor(tags) { + return tags.indoor; + }); + defineRule('landuse', function isLanduse(tags, geometry) { return geometry === 'area' && !_rules.buildings.filter(tags) &&