From 53e82c04a310969f0e63c164bf1dab351b160499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Michalski?= Date: Tue, 5 Dec 2023 17:08:25 +0100 Subject: [PATCH 01/11] Added roof shape and material mapping files --- schema/buildings/defs.yaml | 16 ++-- .../overture_facadeMeterial_OSM_mapping.json | 86 +++++++++++++++++++ .../overture_roofMaterial_OSM_mapping.json | 67 +++++++++++++++ .../overture_roofShape_OSM_mapping.json | 70 +++++++++++++++ 4 files changed, 234 insertions(+), 5 deletions(-) create mode 100644 task-force-docs/buildings/overture_facadeMeterial_OSM_mapping.json create mode 100644 task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json create mode 100644 task-force-docs/buildings/overture_roofShape_OSM_mapping.json diff --git a/schema/buildings/defs.yaml b/schema/buildings/defs.yaml index 4ec6e891..a416196d 100644 --- a/schema/buildings/defs.yaml +++ b/schema/buildings/defs.yaml @@ -31,13 +31,14 @@ shapeContainer: enum: - brick - cement_block + - clay - concrete - glass - metal - - mud - plaster - plastic - stone + - timber_framing - wood roof_material: description: >- @@ -49,9 +50,11 @@ shapeContainer: - eternit - glass - grass + - gravel - metal - plastic - roof_tiles + - solar_panels - slate - tar_paper - thatch @@ -62,14 +65,17 @@ shapeContainer: enum: - dome - flat - - gable + - gabled - gambrel - - half_hip - - hip + - half-hipped + - hipped - mansard - onion - - pyramid + - pyramidal - round + - saltbox + - sawtooth + - skillion - spherical roof_direction: description: >- diff --git a/task-force-docs/buildings/overture_facadeMeterial_OSM_mapping.json b/task-force-docs/buildings/overture_facadeMeterial_OSM_mapping.json new file mode 100644 index 00000000..677afa95 --- /dev/null +++ b/task-force-docs/buildings/overture_facadeMeterial_OSM_mapping.json @@ -0,0 +1,86 @@ +{ + "brick": [ + "brick", + "slate", + "ladrillos", + "masonry", + "silicate brick", + "bricks", + "unburnt brick", + "silicate_brick", + "brick_block", + "muddy_brick" + ], + "cement_block": [ + "cement_block", + "block", + "cement block", + "cement_blocks", + "cement blocks" + ], + "clay": [ + "clay", + "mud", + "rammed_earth", + "loam", + "earth", + "grass", + "pressed_soil_blocks" + ], + "concrete": [ + "concrete", + "concrete masonry unit", + "cement", + "concrete_reinforced", + "reinforced_concrete" + ], + "glass": [ + "glass", + "mirror" + ], + "metal": [ + "metal", + "steel", + "metal_plates", + "tin", + "iron_sheet", + "copper", + "metal_sheet", + "ironsheets", + "panel", + "aluminium" + ], + "plaster": [ + "plaster", + "plastered", + "hard" + ], + "plastic": [ + "plastic", + "vinyl", + "plastic_sheeting", + "composite", + "vinyl_siding" + ], + "stone": [ + "stone", + "limestone", + "sandstone", + "granite", + "marble", + "tiles" + ], + "timber_framing": [ + "timber_framing", + "traditional" + ], + "wood": [ + "wood", + "reed", + "wattle_and_daub", + "timber_planks", + "wood/masonry", + "wood/bamboo", + "bamboo" + ] +} \ No newline at end of file diff --git a/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json b/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json new file mode 100644 index 00000000..4b58d531 --- /dev/null +++ b/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json @@ -0,0 +1,67 @@ +{ + "concrete": [ + "concrete", + "concrete slab", + "rcc", + "asphalt", + "asphalt_shingle" + ], + "copper": [ + "copper" + ], + "eternit": [ + "eternit", + "asbestos", + "a/c sheets" + ], + "glass": [ + "glass", + "acrylic_glass" + ], + "grass": [ + "grass", + "plants", + "roof_greening" + ], + "gravel": [ + "gravel" + ], + "metal": [ + "metal", + "metal:sheet", + "zink", + "corrugated_iron_sheets", + "corrugated_iron", + "iron_sheet", + "corrugated" + ], + "plastic": [ + "plastic", + "composite" + ], + "roof_tiles": [ + "roof_tiles", + "tile", + "tiles", + "roof-tiles", + "clay_tiles" + ], + "slate": [ + "slate", + "brick", + "sandstone", + "stone", + "marble" + ], + "solar_panels": [ + "solar_panels" + ], + "thatch": [ + "thatch", + "cadjan_palmyrah_straw" + ], + "wood": [ + "wood", + "wooden" + ] +} \ No newline at end of file diff --git a/task-force-docs/buildings/overture_roofShape_OSM_mapping.json b/task-force-docs/buildings/overture_roofShape_OSM_mapping.json new file mode 100644 index 00000000..c47740c9 --- /dev/null +++ b/task-force-docs/buildings/overture_roofShape_OSM_mapping.json @@ -0,0 +1,70 @@ +{ + "dome": [ + "dome" + ], + "flat": [ + "flat" + ], + "gambrel": [ + "gambrel" + ], + "gabled": [ + "gabled", + "pitched", + "crosspiched", + "double_pitch", + "gabled_height_moved", + "hip-and-gabled", + "gable", + "gabled_row", + "round_gabled", + "dutch_gabled", + "monopitch", + "2 faces (pitched)", + "gabeled", + "gabed", + "gambled", + "double_gabled", + "gabred", + "cross_gabled" + ], + "half-hipped": [ + "half-hipped" + ], + "hipped": [ + "hipped", + "side_hipped", + "hyped", + "equal_hipped", + "4 faces (hipped)", + "side_half-hipped", + "side_half_hipped" + ], + "mansard": [ + "mansard" + ], + "onion": [ + "onion", + "cone", + "conical" + ], + "pyramidal": [ + "pyramidal" + ], + "round": [ + "round" + ], + "saltbox": [ + "saltbox", + "double_saltbox", + "quadruple_saltbox" + ], + "skillion": [ + "skillion", + "lean_to", + "triple_skillion" + ], + "spherical": [ + "spherical" + ] +} \ No newline at end of file From 0c9138e398118a3c334de09b597b5cb1b5061c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Michalski?= Date: Tue, 12 Dec 2023 15:48:02 +0100 Subject: [PATCH 02/11] camelCased values --- schema/buildings/defs.yaml | 12 ++++++------ ...json => overture_facadeMaterial_OSM_mapping.json} | 4 ++-- .../buildings/overture_roofMaterial_OSM_mapping.json | 4 ++-- .../buildings/overture_roofShape_OSM_mapping.json | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename task-force-docs/buildings/{overture_facadeMeterial_OSM_mapping.json => overture_facadeMaterial_OSM_mapping.json} (96%) diff --git a/schema/buildings/defs.yaml b/schema/buildings/defs.yaml index a416196d..f34f4692 100644 --- a/schema/buildings/defs.yaml +++ b/schema/buildings/defs.yaml @@ -30,7 +30,7 @@ shapeContainer: type: string enum: - brick - - cement_block + - cementBlock - clay - concrete - glass @@ -38,7 +38,7 @@ shapeContainer: - plaster - plastic - stone - - timber_framing + - timberFraming - wood roof_material: description: >- @@ -53,10 +53,10 @@ shapeContainer: - gravel - metal - plastic - - roof_tiles - - solar_panels + - roofTiles + - solarPanels - slate - - tar_paper + - tarPaper - thatch - wood roof_shape: @@ -67,7 +67,7 @@ shapeContainer: - flat - gabled - gambrel - - half-hipped + - halfHipped - hipped - mansard - onion diff --git a/task-force-docs/buildings/overture_facadeMeterial_OSM_mapping.json b/task-force-docs/buildings/overture_facadeMaterial_OSM_mapping.json similarity index 96% rename from task-force-docs/buildings/overture_facadeMeterial_OSM_mapping.json rename to task-force-docs/buildings/overture_facadeMaterial_OSM_mapping.json index 677afa95..4576a5f8 100644 --- a/task-force-docs/buildings/overture_facadeMeterial_OSM_mapping.json +++ b/task-force-docs/buildings/overture_facadeMaterial_OSM_mapping.json @@ -11,7 +11,7 @@ "brick_block", "muddy_brick" ], - "cement_block": [ + "cementBlock": [ "cement_block", "block", "cement block", @@ -70,7 +70,7 @@ "marble", "tiles" ], - "timber_framing": [ + "timberFraming": [ "timber_framing", "traditional" ], diff --git a/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json b/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json index 4b58d531..caba6dd9 100644 --- a/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json +++ b/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json @@ -39,7 +39,7 @@ "plastic", "composite" ], - "roof_tiles": [ + "roofTiles": [ "roof_tiles", "tile", "tiles", @@ -53,7 +53,7 @@ "stone", "marble" ], - "solar_panels": [ + "solarPanels": [ "solar_panels" ], "thatch": [ diff --git a/task-force-docs/buildings/overture_roofShape_OSM_mapping.json b/task-force-docs/buildings/overture_roofShape_OSM_mapping.json index c47740c9..b8534ed9 100644 --- a/task-force-docs/buildings/overture_roofShape_OSM_mapping.json +++ b/task-force-docs/buildings/overture_roofShape_OSM_mapping.json @@ -28,7 +28,7 @@ "gabred", "cross_gabled" ], - "half-hipped": [ + "halfHipped": [ "half-hipped" ], "hipped": [ From 110d6c4267a9f25c29e3f82b1d5e6714fdf1415f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Michalski?= Date: Tue, 12 Dec 2023 15:49:09 +0100 Subject: [PATCH 03/11] added zinc --- task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json | 1 + 1 file changed, 1 insertion(+) diff --git a/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json b/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json index caba6dd9..b7efff26 100644 --- a/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json +++ b/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json @@ -29,6 +29,7 @@ "metal": [ "metal", "metal:sheet", + "zinc", "zink", "corrugated_iron_sheets", "corrugated_iron", From 75f724c471627a47e7eb67be146cf2b0b98e2094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Michalski?= Date: Tue, 12 Dec 2023 15:49:40 +0100 Subject: [PATCH 04/11] added README file to describe usage of mapping files --- task-force-docs/buildings/README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 task-force-docs/buildings/README.md diff --git a/task-force-docs/buildings/README.md b/task-force-docs/buildings/README.md new file mode 100644 index 00000000..07ef5687 --- /dev/null +++ b/task-force-docs/buildings/README.md @@ -0,0 +1,14 @@ +# Description of the mappings file +## facadeMaterial OSM mapping +`overture_facadeMaterial_OSM_mapping.json` file contains mapping of OSM values to Overture `facedMaterial` property. OSM tags used for mapping in order: +- `building:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:building:material) +- `building:facade:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:building:facade:material) + +## roofMaterial OSM mapping +`overture_roofMaterial_OSM_mapping.json` file contains mapping of OSM values to Overture `roofMaterial` property. OSM tags used for mapping: +- `roof:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:roof:material) + +## roofShape OSM mapping +`overture_roofShape_OSM_mapping.json` file contains mapping of OSM values to Overture `roofShape` property. OSM tags used for mapping in order: +- `roof:shape` (documentation: https://wiki.openstreetmap.org/wiki/Key:roof:shape) +- `building:roof:shape` (deprecated, documentation: https://wiki.openstreetmap.org/wiki/Key:building:roof:shape) \ No newline at end of file From d866d61dc977b6f64c0a51f784cde06e20ca5f02 Mon Sep 17 00:00:00 2001 From: Jennings Anderson Date: Thu, 22 Feb 2024 15:50:01 -0800 Subject: [PATCH 05/11] snake_case update --- schema/buildings/defs.yaml | 10 +++++----- ....json => overture_facade_material_OSM_mapping.json} | 6 +++--- ...ng.json => overture_roof_material_OSM_mapping.json} | 2 +- ...pping.json => overture_roof_shape_OSM_mapping.json} | 7 +++++-- 4 files changed, 14 insertions(+), 11 deletions(-) rename task-force-docs/buildings/{overture_facadeMaterial_OSM_mapping.json => overture_facade_material_OSM_mapping.json} (96%) rename task-force-docs/buildings/{overture_roofMaterial_OSM_mapping.json => overture_roof_material_OSM_mapping.json} (99%) rename task-force-docs/buildings/{overture_roofShape_OSM_mapping.json => overture_roof_shape_OSM_mapping.json} (94%) diff --git a/schema/buildings/defs.yaml b/schema/buildings/defs.yaml index f34f4692..0e45a081 100644 --- a/schema/buildings/defs.yaml +++ b/schema/buildings/defs.yaml @@ -30,7 +30,7 @@ shapeContainer: type: string enum: - brick - - cementBlock + - cement_block - clay - concrete - glass @@ -38,7 +38,7 @@ shapeContainer: - plaster - plastic - stone - - timberFraming + - timber_framing - wood roof_material: description: >- @@ -53,8 +53,8 @@ shapeContainer: - gravel - metal - plastic - - roofTiles - - solarPanels + - roof_tiles + - solar_panels - slate - tarPaper - thatch @@ -67,7 +67,7 @@ shapeContainer: - flat - gabled - gambrel - - halfHipped + - half_hipped - hipped - mansard - onion diff --git a/task-force-docs/buildings/overture_facadeMaterial_OSM_mapping.json b/task-force-docs/buildings/overture_facade_material_OSM_mapping.json similarity index 96% rename from task-force-docs/buildings/overture_facadeMaterial_OSM_mapping.json rename to task-force-docs/buildings/overture_facade_material_OSM_mapping.json index 4576a5f8..5111aea4 100644 --- a/task-force-docs/buildings/overture_facadeMaterial_OSM_mapping.json +++ b/task-force-docs/buildings/overture_facade_material_OSM_mapping.json @@ -11,7 +11,7 @@ "brick_block", "muddy_brick" ], - "cementBlock": [ + "cement_block": [ "cement_block", "block", "cement block", @@ -70,7 +70,7 @@ "marble", "tiles" ], - "timberFraming": [ + "timber_framing": [ "timber_framing", "traditional" ], @@ -83,4 +83,4 @@ "wood/bamboo", "bamboo" ] -} \ No newline at end of file +} diff --git a/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json b/task-force-docs/buildings/overture_roof_material_OSM_mapping.json similarity index 99% rename from task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json rename to task-force-docs/buildings/overture_roof_material_OSM_mapping.json index b7efff26..9a65cf8c 100644 --- a/task-force-docs/buildings/overture_roofMaterial_OSM_mapping.json +++ b/task-force-docs/buildings/overture_roof_material_OSM_mapping.json @@ -65,4 +65,4 @@ "wood", "wooden" ] -} \ No newline at end of file +} diff --git a/task-force-docs/buildings/overture_roofShape_OSM_mapping.json b/task-force-docs/buildings/overture_roof_shape_OSM_mapping.json similarity index 94% rename from task-force-docs/buildings/overture_roofShape_OSM_mapping.json rename to task-force-docs/buildings/overture_roof_shape_OSM_mapping.json index b8534ed9..818e501c 100644 --- a/task-force-docs/buildings/overture_roofShape_OSM_mapping.json +++ b/task-force-docs/buildings/overture_roof_shape_OSM_mapping.json @@ -28,7 +28,7 @@ "gabred", "cross_gabled" ], - "halfHipped": [ + "half_hipped": [ "half-hipped" ], "hipped": [ @@ -59,6 +59,9 @@ "double_saltbox", "quadruple_saltbox" ], + "sawtooth":[ + "sawtooth" + ], "skillion": [ "skillion", "lean_to", @@ -67,4 +70,4 @@ "spherical": [ "spherical" ] -} \ No newline at end of file +} From b7c02c36e0aa3dd0e7cfd9fb7c51178bdcf6d431 Mon Sep 17 00:00:00 2001 From: Jennings Anderson Date: Thu, 22 Feb 2024 16:00:09 -0800 Subject: [PATCH 06/11] combining properties and updating readme --- schema/buildings/defs.yaml | 3 +- task-force-docs/buildings/README.md | 24 +- ...sses_mapping.json => classes_mapping.json} | 0 .../overture_facade_material_OSM_mapping.json | 86 ------- .../overture_roof_material_OSM_mapping.json | 68 ------ .../overture_roof_shape_OSM_mapping.json | 73 ------ .../buildings/shape_properties_mapping.json | 230 ++++++++++++++++++ 7 files changed, 248 insertions(+), 236 deletions(-) rename task-force-docs/buildings/{overture_classes_mapping.json => classes_mapping.json} (100%) delete mode 100644 task-force-docs/buildings/overture_facade_material_OSM_mapping.json delete mode 100644 task-force-docs/buildings/overture_roof_material_OSM_mapping.json delete mode 100644 task-force-docs/buildings/overture_roof_shape_OSM_mapping.json create mode 100644 task-force-docs/buildings/shape_properties_mapping.json diff --git a/schema/buildings/defs.yaml b/schema/buildings/defs.yaml index 0e45a081..438f96f8 100644 --- a/schema/buildings/defs.yaml +++ b/schema/buildings/defs.yaml @@ -35,6 +35,7 @@ shapeContainer: - concrete - glass - metal + - mud - plaster - plastic - stone @@ -56,7 +57,7 @@ shapeContainer: - roof_tiles - solar_panels - slate - - tarPaper + - tar_paper - thatch - wood roof_shape: diff --git a/task-force-docs/buildings/README.md b/task-force-docs/buildings/README.md index 07ef5687..6d1f28de 100644 --- a/task-force-docs/buildings/README.md +++ b/task-force-docs/buildings/README.md @@ -1,14 +1,22 @@ -# Description of the mappings file -## facadeMaterial OSM mapping -`overture_facadeMaterial_OSM_mapping.json` file contains mapping of OSM values to Overture `facedMaterial` property. OSM tags used for mapping in order: +Description of the mappings files +=== + +### classes_mapping.json +The mapping for OSM's `building` tag to Overture `class` attribute. + +### shape_properties_mapping.json +Mappings of OSM properties to the related attribute in the Overture shape container: + +### `facade_material` +OSM tags used for mapping in order: - `building:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:building:material) - `building:facade:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:building:facade:material) -## roofMaterial OSM mapping -`overture_roofMaterial_OSM_mapping.json` file contains mapping of OSM values to Overture `roofMaterial` property. OSM tags used for mapping: +### `roof_material` +OSM tags used for mapping: - `roof:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:roof:material) -## roofShape OSM mapping -`overture_roofShape_OSM_mapping.json` file contains mapping of OSM values to Overture `roofShape` property. OSM tags used for mapping in order: +## `roof_shape` +OSM tags used for mapping in order: - `roof:shape` (documentation: https://wiki.openstreetmap.org/wiki/Key:roof:shape) -- `building:roof:shape` (deprecated, documentation: https://wiki.openstreetmap.org/wiki/Key:building:roof:shape) \ No newline at end of file +- `building:roof:shape` (deprecated, documentation: https://wiki.openstreetmap.org/wiki/Key:building:roof:shape) diff --git a/task-force-docs/buildings/overture_classes_mapping.json b/task-force-docs/buildings/classes_mapping.json similarity index 100% rename from task-force-docs/buildings/overture_classes_mapping.json rename to task-force-docs/buildings/classes_mapping.json diff --git a/task-force-docs/buildings/overture_facade_material_OSM_mapping.json b/task-force-docs/buildings/overture_facade_material_OSM_mapping.json deleted file mode 100644 index 5111aea4..00000000 --- a/task-force-docs/buildings/overture_facade_material_OSM_mapping.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "brick": [ - "brick", - "slate", - "ladrillos", - "masonry", - "silicate brick", - "bricks", - "unburnt brick", - "silicate_brick", - "brick_block", - "muddy_brick" - ], - "cement_block": [ - "cement_block", - "block", - "cement block", - "cement_blocks", - "cement blocks" - ], - "clay": [ - "clay", - "mud", - "rammed_earth", - "loam", - "earth", - "grass", - "pressed_soil_blocks" - ], - "concrete": [ - "concrete", - "concrete masonry unit", - "cement", - "concrete_reinforced", - "reinforced_concrete" - ], - "glass": [ - "glass", - "mirror" - ], - "metal": [ - "metal", - "steel", - "metal_plates", - "tin", - "iron_sheet", - "copper", - "metal_sheet", - "ironsheets", - "panel", - "aluminium" - ], - "plaster": [ - "plaster", - "plastered", - "hard" - ], - "plastic": [ - "plastic", - "vinyl", - "plastic_sheeting", - "composite", - "vinyl_siding" - ], - "stone": [ - "stone", - "limestone", - "sandstone", - "granite", - "marble", - "tiles" - ], - "timber_framing": [ - "timber_framing", - "traditional" - ], - "wood": [ - "wood", - "reed", - "wattle_and_daub", - "timber_planks", - "wood/masonry", - "wood/bamboo", - "bamboo" - ] -} diff --git a/task-force-docs/buildings/overture_roof_material_OSM_mapping.json b/task-force-docs/buildings/overture_roof_material_OSM_mapping.json deleted file mode 100644 index 9a65cf8c..00000000 --- a/task-force-docs/buildings/overture_roof_material_OSM_mapping.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "concrete": [ - "concrete", - "concrete slab", - "rcc", - "asphalt", - "asphalt_shingle" - ], - "copper": [ - "copper" - ], - "eternit": [ - "eternit", - "asbestos", - "a/c sheets" - ], - "glass": [ - "glass", - "acrylic_glass" - ], - "grass": [ - "grass", - "plants", - "roof_greening" - ], - "gravel": [ - "gravel" - ], - "metal": [ - "metal", - "metal:sheet", - "zinc", - "zink", - "corrugated_iron_sheets", - "corrugated_iron", - "iron_sheet", - "corrugated" - ], - "plastic": [ - "plastic", - "composite" - ], - "roofTiles": [ - "roof_tiles", - "tile", - "tiles", - "roof-tiles", - "clay_tiles" - ], - "slate": [ - "slate", - "brick", - "sandstone", - "stone", - "marble" - ], - "solarPanels": [ - "solar_panels" - ], - "thatch": [ - "thatch", - "cadjan_palmyrah_straw" - ], - "wood": [ - "wood", - "wooden" - ] -} diff --git a/task-force-docs/buildings/overture_roof_shape_OSM_mapping.json b/task-force-docs/buildings/overture_roof_shape_OSM_mapping.json deleted file mode 100644 index 818e501c..00000000 --- a/task-force-docs/buildings/overture_roof_shape_OSM_mapping.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "dome": [ - "dome" - ], - "flat": [ - "flat" - ], - "gambrel": [ - "gambrel" - ], - "gabled": [ - "gabled", - "pitched", - "crosspiched", - "double_pitch", - "gabled_height_moved", - "hip-and-gabled", - "gable", - "gabled_row", - "round_gabled", - "dutch_gabled", - "monopitch", - "2 faces (pitched)", - "gabeled", - "gabed", - "gambled", - "double_gabled", - "gabred", - "cross_gabled" - ], - "half_hipped": [ - "half-hipped" - ], - "hipped": [ - "hipped", - "side_hipped", - "hyped", - "equal_hipped", - "4 faces (hipped)", - "side_half-hipped", - "side_half_hipped" - ], - "mansard": [ - "mansard" - ], - "onion": [ - "onion", - "cone", - "conical" - ], - "pyramidal": [ - "pyramidal" - ], - "round": [ - "round" - ], - "saltbox": [ - "saltbox", - "double_saltbox", - "quadruple_saltbox" - ], - "sawtooth":[ - "sawtooth" - ], - "skillion": [ - "skillion", - "lean_to", - "triple_skillion" - ], - "spherical": [ - "spherical" - ] -} diff --git a/task-force-docs/buildings/shape_properties_mapping.json b/task-force-docs/buildings/shape_properties_mapping.json new file mode 100644 index 00000000..6f2ccc2f --- /dev/null +++ b/task-force-docs/buildings/shape_properties_mapping.json @@ -0,0 +1,230 @@ +{ + "facade_material": + { + "brick": [ + "brick", + "slate", + "ladrillos", + "masonry", + "silicate brick", + "bricks", + "unburnt brick", + "silicate_brick", + "brick_block", + "muddy_brick" + ], + "cement_block": [ + "cement_block", + "block", + "cement block", + "cement_blocks", + "cement blocks" + ], + "clay": [ + "clay", + "mud", + "rammed_earth", + "loam", + "earth", + "grass", + "pressed_soil_blocks" + ], + "concrete": [ + "concrete", + "concrete masonry unit", + "cement", + "concrete_reinforced", + "reinforced_concrete" + ], + "glass": [ + "glass", + "mirror" + ], + "metal": [ + "metal", + "steel", + "metal_plates", + "tin", + "iron_sheet", + "copper", + "metal_sheet", + "ironsheets", + "panel", + "aluminium" + ], + "plaster": [ + "plaster", + "plastered", + "hard" + ], + "plastic": [ + "plastic", + "vinyl", + "plastic_sheeting", + "composite", + "vinyl_siding" + ], + "stone": [ + "stone", + "limestone", + "sandstone", + "granite", + "marble", + "tiles" + ], + "timber_framing": [ + "timber_framing", + "traditional" + ], + "wood": [ + "wood", + "reed", + "wattle_and_daub", + "timber_planks", + "wood/masonry", + "wood/bamboo", + "bamboo" + ] + }, + "roof_material":{ + "concrete": [ + "concrete", + "concrete slab", + "rcc", + "asphalt", + "asphalt_shingle" + ], + "copper": [ + "copper" + ], + "eternit": [ + "eternit", + "asbestos", + "a/c sheets" + ], + "glass": [ + "glass", + "acrylic_glass" + ], + "grass": [ + "grass", + "plants", + "roof_greening" + ], + "gravel": [ + "gravel" + ], + "metal": [ + "metal", + "metal:sheet", + "zinc", + "zink", + "corrugated_iron_sheets", + "corrugated_iron", + "iron_sheet", + "corrugated" + ], + "plastic": [ + "plastic", + "composite" + ], + "roof_tiles": [ + "roof_tiles", + "tile", + "tiles", + "roof-tiles", + "clay_tiles" + ], + "slate": [ + "slate", + "brick", + "sandstone", + "stone", + "marble" + ], + "solar_panels": [ + "solar_panels" + ], + "thatch": [ + "thatch", + "cadjan_palmyrah_straw" + ], + "wood": [ + "wood", + "wooden" + ] + }, + "roof_shape":{ + "dome": [ + "dome" + ], + "flat": [ + "flat" + ], + "gambrel": [ + "gambrel" + ], + "gabled": [ + "gabled", + "pitched", + "crosspiched", + "double_pitch", + "gabled_height_moved", + "hip-and-gabled", + "gable", + "gabled_row", + "round_gabled", + "dutch_gabled", + "monopitch", + "2 faces (pitched)", + "gabeled", + "gabed", + "gambled", + "double_gabled", + "gabred", + "cross_gabled" + ], + "half_hipped": [ + "half-hipped" + ], + "hipped": [ + "hipped", + "side_hipped", + "hyped", + "equal_hipped", + "4 faces (hipped)", + "side_half-hipped", + "side_half_hipped" + ], + "mansard": [ + "mansard" + ], + "onion": [ + "onion", + "cone", + "conical" + ], + "pyramidal": [ + "pyramidal" + ], + "round": [ + "round" + ], + "saltbox": [ + "saltbox", + "double_saltbox", + "quadruple_saltbox" + ], + "sawtooth":[ + "sawtooth" + ], + "skillion": [ + "skillion", + "lean_to", + "triple_skillion" + ], + "spherical": [ + "spherical" + ] + } +} From 485461f9b7dfa1e229f7c59c3b222ce4340c0b1d Mon Sep 17 00:00:00 2001 From: Jennings Anderson Date: Mon, 26 Feb 2024 10:38:51 -0500 Subject: [PATCH 07/11] break out into files --- task-force-docs/buildings/README.md | 11 +- ...lasses_mapping.json => class_mapping.json} | 0 .../buildings/facade_material_mapping.json | 86 +++++++ .../buildings/roof_material_mapping.json | 68 ++++++ .../buildings/roof_shape_mapping.json | 73 ++++++ .../buildings/shape_properties_mapping.json | 230 ------------------ 6 files changed, 231 insertions(+), 237 deletions(-) rename task-force-docs/buildings/{classes_mapping.json => class_mapping.json} (100%) create mode 100644 task-force-docs/buildings/facade_material_mapping.json create mode 100644 task-force-docs/buildings/roof_material_mapping.json create mode 100644 task-force-docs/buildings/roof_shape_mapping.json delete mode 100644 task-force-docs/buildings/shape_properties_mapping.json diff --git a/task-force-docs/buildings/README.md b/task-force-docs/buildings/README.md index 6d1f28de..8d507a12 100644 --- a/task-force-docs/buildings/README.md +++ b/task-force-docs/buildings/README.md @@ -1,22 +1,19 @@ Description of the mappings files === -### classes_mapping.json +### `class_mapping.json` The mapping for OSM's `building` tag to Overture `class` attribute. -### shape_properties_mapping.json -Mappings of OSM properties to the related attribute in the Overture shape container: - -### `facade_material` +### `facade_material_mapping.json` OSM tags used for mapping in order: - `building:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:building:material) - `building:facade:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:building:facade:material) -### `roof_material` +### `roof_material_mapping.json` OSM tags used for mapping: - `roof:material` (documentation: https://wiki.openstreetmap.org/wiki/Key:roof:material) -## `roof_shape` +## `roof_shape_mapping.json` OSM tags used for mapping in order: - `roof:shape` (documentation: https://wiki.openstreetmap.org/wiki/Key:roof:shape) - `building:roof:shape` (deprecated, documentation: https://wiki.openstreetmap.org/wiki/Key:building:roof:shape) diff --git a/task-force-docs/buildings/classes_mapping.json b/task-force-docs/buildings/class_mapping.json similarity index 100% rename from task-force-docs/buildings/classes_mapping.json rename to task-force-docs/buildings/class_mapping.json diff --git a/task-force-docs/buildings/facade_material_mapping.json b/task-force-docs/buildings/facade_material_mapping.json new file mode 100644 index 00000000..e8e41c84 --- /dev/null +++ b/task-force-docs/buildings/facade_material_mapping.json @@ -0,0 +1,86 @@ +{ + "brick": [ + "brick", + "slate", + "ladrillos", + "masonry", + "silicate brick", + "bricks", + "unburnt brick", + "silicate_brick", + "brick_block", + "muddy_brick" + ], + "cement_block": [ + "cement_block", + "block", + "cement block", + "cement_blocks", + "cement blocks" + ], + "clay": [ + "clay", + "mud", + "rammed_earth", + "loam", + "earth", + "grass", + "pressed_soil_blocks" + ], + "concrete": [ + "concrete", + "concrete masonry unit", + "cement", + "concrete_reinforced", + "reinforced_concrete" + ], + "glass": [ + "glass", + "mirror" + ], + "metal": [ + "metal", + "steel", + "metal_plates", + "tin", + "iron_sheet", + "copper", + "metal_sheet", + "ironsheets", + "panel", + "aluminium" + ], + "plaster": [ + "plaster", + "plastered", + "hard" + ], + "plastic": [ + "plastic", + "vinyl", + "plastic_sheeting", + "composite", + "vinyl_siding" + ], + "stone": [ + "stone", + "limestone", + "sandstone", + "granite", + "marble", + "tiles" + ], + "timber_framing": [ + "timber_framing", + "traditional" + ], + "wood": [ + "wood", + "reed", + "wattle_and_daub", + "timber_planks", + "wood/masonry", + "wood/bamboo", + "bamboo" + ] +} diff --git a/task-force-docs/buildings/roof_material_mapping.json b/task-force-docs/buildings/roof_material_mapping.json new file mode 100644 index 00000000..e46cbaf9 --- /dev/null +++ b/task-force-docs/buildings/roof_material_mapping.json @@ -0,0 +1,68 @@ +{ + "concrete": [ + "concrete", + "concrete slab", + "rcc", + "asphalt", + "asphalt_shingle" + ], + "copper": [ + "copper" + ], + "eternit": [ + "eternit", + "asbestos", + "a/c sheets" + ], + "glass": [ + "glass", + "acrylic_glass" + ], + "grass": [ + "grass", + "plants", + "roof_greening" + ], + "gravel": [ + "gravel" + ], + "metal": [ + "metal", + "metal:sheet", + "zinc", + "zink", + "corrugated_iron_sheets", + "corrugated_iron", + "iron_sheet", + "corrugated" + ], + "plastic": [ + "plastic", + "composite" + ], + "roof_tiles": [ + "roof_tiles", + "tile", + "tiles", + "roof-tiles", + "clay_tiles" + ], + "slate": [ + "slate", + "brick", + "sandstone", + "stone", + "marble" + ], + "solar_panels": [ + "solar_panels" + ], + "thatch": [ + "thatch", + "cadjan_palmyrah_straw" + ], + "wood": [ + "wood", + "wooden" + ] +} diff --git a/task-force-docs/buildings/roof_shape_mapping.json b/task-force-docs/buildings/roof_shape_mapping.json new file mode 100644 index 00000000..725de237 --- /dev/null +++ b/task-force-docs/buildings/roof_shape_mapping.json @@ -0,0 +1,73 @@ +{ + "dome": [ + "dome" + ], + "flat": [ + "flat" + ], + "gambrel": [ + "gambrel" + ], + "gabled": [ + "gabled", + "pitched", + "crosspiched", + "double_pitch", + "gabled_height_moved", + "hip-and-gabled", + "gable", + "gabled_row", + "round_gabled", + "dutch_gabled", + "monopitch", + "2 faces (pitched)", + "gabeled", + "gabed", + "gambled", + "double_gabled", + "gabred", + "cross_gabled" + ], + "half_hipped": [ + "half-hipped" + ], + "hipped": [ + "hipped", + "side_hipped", + "hyped", + "equal_hipped", + "4 faces (hipped)", + "side_half-hipped", + "side_half_hipped" + ], + "mansard": [ + "mansard" + ], + "onion": [ + "onion", + "cone", + "conical" + ], + "pyramidal": [ + "pyramidal" + ], + "round": [ + "round" + ], + "saltbox": [ + "saltbox", + "double_saltbox", + "quadruple_saltbox" + ], + "sawtooth":[ + "sawtooth" + ], + "skillion": [ + "skillion", + "lean_to", + "triple_skillion" + ], + "spherical": [ + "spherical" + ] +} diff --git a/task-force-docs/buildings/shape_properties_mapping.json b/task-force-docs/buildings/shape_properties_mapping.json deleted file mode 100644 index 6f2ccc2f..00000000 --- a/task-force-docs/buildings/shape_properties_mapping.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "facade_material": - { - "brick": [ - "brick", - "slate", - "ladrillos", - "masonry", - "silicate brick", - "bricks", - "unburnt brick", - "silicate_brick", - "brick_block", - "muddy_brick" - ], - "cement_block": [ - "cement_block", - "block", - "cement block", - "cement_blocks", - "cement blocks" - ], - "clay": [ - "clay", - "mud", - "rammed_earth", - "loam", - "earth", - "grass", - "pressed_soil_blocks" - ], - "concrete": [ - "concrete", - "concrete masonry unit", - "cement", - "concrete_reinforced", - "reinforced_concrete" - ], - "glass": [ - "glass", - "mirror" - ], - "metal": [ - "metal", - "steel", - "metal_plates", - "tin", - "iron_sheet", - "copper", - "metal_sheet", - "ironsheets", - "panel", - "aluminium" - ], - "plaster": [ - "plaster", - "plastered", - "hard" - ], - "plastic": [ - "plastic", - "vinyl", - "plastic_sheeting", - "composite", - "vinyl_siding" - ], - "stone": [ - "stone", - "limestone", - "sandstone", - "granite", - "marble", - "tiles" - ], - "timber_framing": [ - "timber_framing", - "traditional" - ], - "wood": [ - "wood", - "reed", - "wattle_and_daub", - "timber_planks", - "wood/masonry", - "wood/bamboo", - "bamboo" - ] - }, - "roof_material":{ - "concrete": [ - "concrete", - "concrete slab", - "rcc", - "asphalt", - "asphalt_shingle" - ], - "copper": [ - "copper" - ], - "eternit": [ - "eternit", - "asbestos", - "a/c sheets" - ], - "glass": [ - "glass", - "acrylic_glass" - ], - "grass": [ - "grass", - "plants", - "roof_greening" - ], - "gravel": [ - "gravel" - ], - "metal": [ - "metal", - "metal:sheet", - "zinc", - "zink", - "corrugated_iron_sheets", - "corrugated_iron", - "iron_sheet", - "corrugated" - ], - "plastic": [ - "plastic", - "composite" - ], - "roof_tiles": [ - "roof_tiles", - "tile", - "tiles", - "roof-tiles", - "clay_tiles" - ], - "slate": [ - "slate", - "brick", - "sandstone", - "stone", - "marble" - ], - "solar_panels": [ - "solar_panels" - ], - "thatch": [ - "thatch", - "cadjan_palmyrah_straw" - ], - "wood": [ - "wood", - "wooden" - ] - }, - "roof_shape":{ - "dome": [ - "dome" - ], - "flat": [ - "flat" - ], - "gambrel": [ - "gambrel" - ], - "gabled": [ - "gabled", - "pitched", - "crosspiched", - "double_pitch", - "gabled_height_moved", - "hip-and-gabled", - "gable", - "gabled_row", - "round_gabled", - "dutch_gabled", - "monopitch", - "2 faces (pitched)", - "gabeled", - "gabed", - "gambled", - "double_gabled", - "gabred", - "cross_gabled" - ], - "half_hipped": [ - "half-hipped" - ], - "hipped": [ - "hipped", - "side_hipped", - "hyped", - "equal_hipped", - "4 faces (hipped)", - "side_half-hipped", - "side_half_hipped" - ], - "mansard": [ - "mansard" - ], - "onion": [ - "onion", - "cone", - "conical" - ], - "pyramidal": [ - "pyramidal" - ], - "round": [ - "round" - ], - "saltbox": [ - "saltbox", - "double_saltbox", - "quadruple_saltbox" - ], - "sawtooth":[ - "sawtooth" - ], - "skillion": [ - "skillion", - "lean_to", - "triple_skillion" - ], - "spherical": [ - "spherical" - ] - } -} From 1d6244a17831d75095c9c9d4af49a3473b79cde9 Mon Sep 17 00:00:00 2001 From: Jennings Anderson Date: Mon, 26 Feb 2024 11:40:10 -0500 Subject: [PATCH 08/11] adding tar_paper as 4th largest value in OSM --- schema/buildings/defs.yaml | 4 +- .../buildings/roof_material_mapping.json | 37 +++++++++++-------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/schema/buildings/defs.yaml b/schema/buildings/defs.yaml index 438f96f8..7902c26f 100644 --- a/schema/buildings/defs.yaml +++ b/schema/buildings/defs.yaml @@ -35,7 +35,6 @@ shapeContainer: - concrete - glass - metal - - mud - plaster - plastic - stone @@ -55,9 +54,8 @@ shapeContainer: - metal - plastic - roof_tiles - - solar_panels - slate - - tar_paper + - solar_panels - thatch - wood roof_shape: diff --git a/task-force-docs/buildings/roof_material_mapping.json b/task-force-docs/buildings/roof_material_mapping.json index e46cbaf9..bc2ae119 100644 --- a/task-force-docs/buildings/roof_material_mapping.json +++ b/task-force-docs/buildings/roof_material_mapping.json @@ -1,18 +1,18 @@ { "concrete": [ - "concrete", - "concrete slab", - "rcc", + "asphalt_shingle", "asphalt", - "asphalt_shingle" + "concrete slab", + "concrete", + "rcc" ], "copper": [ "copper" ], "eternit": [ - "eternit", + "a/c sheets", "asbestos", - "a/c sheets" + "eternit" ], "glass": [ "glass", @@ -27,14 +27,16 @@ "gravel" ], "metal": [ - "metal", - "metal:sheet", - "zinc", - "zink", "corrugated_iron_sheets", "corrugated_iron", + "corrugated", "iron_sheet", - "corrugated" + "metal_sheet", + "metal:sheet", + "metal", + "tin", + "zinc", + "zink" ], "plastic": [ "plastic", @@ -48,18 +50,21 @@ "clay_tiles" ], "slate": [ - "slate", "brick", + "marble", "sandstone", - "stone", - "marble" + "slate", + "stone" ], "solar_panels": [ "solar_panels" ], + "tar_paper": [ + "tar_paper" + ], "thatch": [ - "thatch", - "cadjan_palmyrah_straw" + "cadjan_palmyrah_straw", + "thatch" ], "wood": [ "wood", From d3641fd5401c0e5dad661543a51d0aa5840750a2 Mon Sep 17 00:00:00 2001 From: Jennings Anderson Date: Mon, 26 Feb 2024 14:36:48 -0500 Subject: [PATCH 09/11] putting tar_paper back --- schema/buildings/defs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/schema/buildings/defs.yaml b/schema/buildings/defs.yaml index 7902c26f..ebbb7a23 100644 --- a/schema/buildings/defs.yaml +++ b/schema/buildings/defs.yaml @@ -57,6 +57,7 @@ shapeContainer: - slate - solar_panels - thatch + - tar_paper - wood roof_shape: description: The shape of the roof From 7302a624cdd630111398b992c3a0b0c59e507059 Mon Sep 17 00:00:00 2001 From: Jennings Anderson Date: Tue, 27 Feb 2024 16:34:20 -0500 Subject: [PATCH 10/11] Adding more complex building logic --- ...pping.json => building_class_mapping.json} | 0 .../buildings/building_class_query.sql | 201 ++++++++++++++++++ 2 files changed, 201 insertions(+) rename task-force-docs/buildings/{class_mapping.json => building_class_mapping.json} (100%) create mode 100644 task-force-docs/buildings/building_class_query.sql diff --git a/task-force-docs/buildings/class_mapping.json b/task-force-docs/buildings/building_class_mapping.json similarity index 100% rename from task-force-docs/buildings/class_mapping.json rename to task-force-docs/buildings/building_class_mapping.json diff --git a/task-force-docs/buildings/building_class_query.sql b/task-force-docs/buildings/building_class_query.sql new file mode 100644 index 00000000..31f66fe8 --- /dev/null +++ b/task-force-docs/buildings/building_class_query.sql @@ -0,0 +1,201 @@ +CASE + -- Agricultural + WHEN tags['building'] IN ( + 'agricultural', + 'barn', + 'cowshed', + 'farm', + 'farm_auxiliary', + 'glasshouse', + 'greenhouse', + 'silo', + 'stable', + 'sty' + ) THEN 'agricultural' + + -- Civic + WHEN tags['building'] IN ( + 'civic', + 'fire_station', + 'government', + 'government_office', + 'public' + ) OR tags['amenity'] IN ( + 'animal_shelter', + 'community_centre', + 'courthouse', + 'fire_station', + 'library', + 'police', + 'post_office', + 'public_bath', + 'public_building', + 'ranger_station', + 'shelter', + 'social_centre', + 'townhall', + 'veterinary' + ) THEN 'civic' + + --Commercial + WHEN tags['building'] IN ( + 'commercial', + 'hotel', + 'kiosk', + 'marketplace', + 'office', + 'restaurant', + 'retail', + 'shop', + 'supermarket', + 'warehouse' + ) OR tags['amenity'] IN ( + 'bar', + 'cafe', + 'fast_food', + 'food_court', + 'fuel', + 'ice_cream', + 'pub', + 'restaurant' + ) THEN 'commercial' + + --Education + WHEN tags['building'] IN ( + 'college', + 'kindergarten', + 'school', + 'university' + ) OR tags['amenity'] IN ( + 'college', + 'driving_school', + 'kindergarten', + 'music_school', + 'school', + 'university' + ) THEN 'education' + + --Entertainment + WHEN tags['building'] IN ( + 'grandstand', + 'pavillion', + 'sports_centre', + 'sports_hall', + 'stadium' + ) OR tags['amenity'] IN ( + 'casino', + 'conference_centre', + 'events_venue', + 'cinema', + 'theatre', + 'arts_centre', + 'nightclub' + ) OR tags['tourism'] IN ( + 'aquarium', + 'attraction', + 'gallery', + 'museum' + ) THEN 'entertainment' + + --Industrial + WHEN tags['building'] IN ( + 'factory', + 'industrial', + 'manufacture' + ) THEN 'industrial' + + --Medical + WHEN tags['building'] IN ( + 'clinic', + 'hospital' + ) OR tags['amenity'] IN ( + 'clinic', + 'dentist', + 'doctors', + 'hospital', + 'pharmacy' + ) THEN 'medical' + + --Military + WHEN tags['building'] IN ( + 'bunker', + 'military' + ) THEN 'military' + + --Outbuilding + WHEN tags['building'] IN ( + 'allotment_house', + 'carport', + 'outbuilding', + 'shed' + ) THEN 'outbuilding' + + --Religious + WHEN tags['building'] IN ( + 'cathedral', + 'chapel', + 'church', + 'monastary', + 'mosque', + 'presbytery', + 'religious', + 'shrine', + 'synagogue', + 'temple', + 'wayside_shrine' + ) OR tags['amenity'] = 'place_of_worship' + THEN 'religious' + + --Residential + WHEN tags['building'] IN ( + 'apartments', + 'bungalow', + 'cabin', + 'detached', + 'dormitory', + 'duplex', + 'dwelling_house', + 'garage', + 'garages', + 'ger', + 'house', + 'houseboat', + 'hut', + 'residential', + 'semi', + 'semidetached_house', + 'static_caravan', + 'stilt_house', + 'terrace', + 'townhouse', + 'trullo' + ) OR tags['amenity'] IN ( + 'nursing_home' + ) THEN 'residential' + + --Service + WHEN tags['building'] IN ( + 'beach_hut', + 'boathouse', + 'digester', + 'guardhouse', + 'parking', + 'service', + 'slurry_tank', + 'storage_tank', + 'toilets', + 'transformer_tower' + ) THEN 'service' + + --Transportation + WHEN tags['building'] IN ( + 'hangar', + 'train_station', + 'transportation' + ) OR tags['amenity'] IN ( + 'bicycle_parking', + 'bus_station', + 'parking' + )THEN 'transportation' + ELSE NULL +END From 0968d40a969982b710158aad245ed1a6ceb64d15 Mon Sep 17 00:00:00 2001 From: Jennings Anderson Date: Tue, 27 Feb 2024 17:49:46 -0500 Subject: [PATCH 11/11] Changing building mapping to a query --- task-force-docs/buildings/building_class_query.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/task-force-docs/buildings/building_class_query.sql b/task-force-docs/buildings/building_class_query.sql index 31f66fe8..d71a4c39 100644 --- a/task-force-docs/buildings/building_class_query.sql +++ b/task-force-docs/buildings/building_class_query.sql @@ -196,6 +196,6 @@ CASE 'bicycle_parking', 'bus_station', 'parking' - )THEN 'transportation' + ) THEN 'transportation' ELSE NULL END