Skip to content

Commit 26c1ff1

Browse files
committed
only apply layer=1 on newly creted roofs; improve fields for roof preset
* closes #1432 by changing the `layer=1` tag from an `addTags` tag to the default value of the `layer` field * some of the fields for "regular" buildings don't make sense for "roof-only" features
1 parent da79c55 commit 26c1ff1

File tree

3 files changed

+27
-9
lines changed

3 files changed

+27
-9
lines changed

data/fields/layer_1.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"key": "layer",
3+
"type": "number",
4+
"label": "{layer}",
5+
"placeholder": "0",
6+
"default": "1"
7+
}

data/presets/building/roof.json

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
{
22
"icon": "maki-shelter",
33
"fields": [
4-
"{building}",
5-
"layer"
4+
"building",
5+
"height",
6+
"layer_1"
7+
],
8+
"moreFields": [
9+
"address",
10+
"architect",
11+
"building/colour",
12+
"building/levels",
13+
"building/levels/underground",
14+
"building/material",
15+
"building/prefabricated",
16+
"ele",
17+
"gnis/feature_id-US",
18+
"not/name",
19+
"operator",
20+
"roof/colour"
621
],
722
"geometry": [
823
"area"
924
],
1025
"tags": {
1126
"building": "roof"
1227
},
13-
"addTags": {
14-
"building": "roof",
15-
"layer": "1"
16-
},
1728
"matchScore": 0.5,
1829
"name": "Roof"
1930
}

data/presets/power/generator/method/photovoltaic/building/roof.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"icon": "fas-solar-panel",
33
"fields": [
4-
"{power/generator/method/photovoltaic}"
4+
"{power/generator/method/photovoltaic}",
5+
"layer_1"
56
],
67
"moreFields": [
78
"{power/generator}"
@@ -22,8 +23,7 @@
2223
"generator:method": "photovoltaic",
2324
"generator:type": "solar_photovoltaic_panel",
2425
"generator:output:electricity": "*",
25-
"building": "roof",
26-
"layer": "1"
26+
"building": "roof"
2727
},
2828
"reference": {
2929
"key": "generator:method",

0 commit comments

Comments
 (0)