Commit Graph

385 Commits

Author SHA1 Message Date
Quincy Morgan
512dfaa52c Updated attraction presets to use field inheritance
Added generic attraction preset with attraction typeCombo field
2019-01-15 15:28:01 -05:00
Quincy Morgan
20553dc977 Fix for prior commit 2019-01-15 14:56:30 -05:00
Quincy Morgan
c6dd743f90 Updated social_facility and vending_machine presets to use field inheritance 2019-01-15 14:55:52 -05:00
Quincy Morgan
4252c5cb36 Presets no longer inherit fields for keys that define them 2019-01-15 13:52:03 -05:00
Quincy Morgan
0da15efc10 Merge branch 'master' into preset-field-inheritance
# Conflicts:
#	data/presets/presets.json
2019-01-15 11:44:16 -05:00
Quincy Morgan
d1a7400ed7 Added a field for the building:material key 2019-01-15 11:42:55 -05:00
Quincy Morgan
1ba61140f5 Changed the material field to be non-universal
Added the material field to the fields or moreFields properties of relevant presets
2019-01-15 11:35:56 -05:00
Quincy Morgan
becc087a91 Moved the seamark/type field from a universal field to the fields or moreFields properties of relevant presets 2019-01-15 10:53:35 -05:00
Quincy Morgan
ae7c099c8a Moved field inheritance resolution from the data build to the preset initialization
Removed the data build check for duplicate values between fields and moreFields
Renamed the shop field from Type to Shop Type
Renamed the beauty field from Shop Type to Beauty Specialty
Added the brand field to the shop preset under moreFields
2019-01-15 09:53:26 -05:00
Bryan Housel
7db6133666 Merge pull request #5583 from quincylvania/field-prerequisite-tags
Mechanism for displaying fields conditionally based on tags
2018-12-19 12:08:15 -05:00
Bryan Housel
f478fdbfbd Add preset for Enforcement relation type
(closes #5610)
2018-12-19 10:45:54 -05:00
Bryan Housel
007faeae6e Adjust fields, add couplings, simplify labels 2018-12-18 11:31:30 -05:00
Bryan Housel
9f5d2b2e7e Merge branch 'fire-hydrants-shortened' of https://github.com/momu/iD into momu-fire-hydrants-shortened 2018-12-18 10:37:52 -05:00
Quincy Morgan
7e9082b9ff Merge branch 'master' into field-prerequisite-tags 2018-12-18 09:33:46 -05:00
Bryan Housel
029f702d99 Add Road Closed preset and render style
(re: #5599)
2018-12-17 17:53:55 -05:00
Bryan Housel
c6674449a3 Add diet: multicombo, put it in moreFields with the internet stuff
(closes #5580)
2018-12-16 14:40:28 -05:00
Quincy Morgan
a4b2924e4e Merge branch 'master' into field-prerequisite-tags 2018-12-13 17:23:54 -08:00
Bryan Housel
4b3ce2c07c Add basin=* Type and intermittent fields to Basin preset
(closes #5497)
2018-12-09 23:13:15 -05:00
Quincy Morgan
5471b909e2 Added mechanism for displaying fields conditionally based on tags 2018-12-09 20:11:31 -08:00
Quincy Morgan
82263aea7c Adds a Wikidata field 2018-11-18 19:38:19 -05:00
mm
243f24a641 reduce fire_hydrant fields 2018-11-17 21:57:28 +01:00
mm
daa03e89d2 fire_hydrants finalized 2018-11-14 22:40:14 +01:00
mm
e440fce978 add fields for fire_hydrant 2018-11-06 22:55:18 +01:00
mm
85f475d9ca wip: new fire_hydrant scheme 2018-11-06 22:27:13 +01:00
mm
63c2528b51 wip: new fire_hydrant scheme 2018-11-01 22:44:34 +01:00
Bryan Housel
1b0d7636d3 Add scuba_diving: services multiselect field, update terms
This updates both the `shop=scuba_diving` and `amenity=dive_centre` presets
2018-10-31 11:57:43 -04:00
Bryan Housel
7709a7ef3f npm run build to remove extra space 2018-10-24 13:29:54 -04:00
castriganoj
266756bd9d Add fields for To and From and add fields to all route presets. 2018-10-17 20:29:46 -04:00
yves
4fefa51574 No differentiation of piste type field is needed, it's even disturbing to see the piste field change when you change the piste type. 2018-10-11 14:11:02 +02:00
Bryan Housel
bbed7e1437 Merge pull request #5384 from quincylvania/generator-output-electricity-typecombo
Converts the generator/output/electricity field from text to typeCombo
2018-10-08 22:26:14 -04:00
Simon Bilsky-Rollins
c886490f79 add minValue and placeholder for seats field 2018-10-08 22:09:34 -04:00
Simon Bilsky-Rollins
29765f961d add fields to bench preset and create seats field 2018-10-08 12:14:03 -04:00
Quincy Morgan
73ede123c2 Converts the generator/output/electricity field from text to typeCombo 2018-10-07 13:31:15 -07:00
Quincy Morgan
62d16d8b5a Corrects the names of the curb presets and seamark color fields to use US English spellings 2018-10-07 12:26:28 -07:00
Bryan Housel
fa15acc4bb Use 'en-us' "Color" 2018-10-07 14:16:15 -04:00
Quincy Morgan
b7555b4f0b Adds the generated changes for #5376 2018-10-07 11:09:42 -07:00
yves
67d5e89680 Add colour field to the piste route preset 2018-10-06 09:10:28 +02:00
yves
3296176d7a Change the piste presets directory structure and other fixes 2018-10-06 08:27:10 +02:00
yves
77f534f497 Build 2018-10-04 15:34:01 +02:00
Bryan Housel
d55fe9f5df Add generic "Recycling" preset and field recycling_type=container/center
(closes #5363)
2018-10-02 17:44:45 -04:00
Michael Pu
981910ea08 Include build files 2018-10-01 21:26:14 -04:00
Nadya Febiana Djojosantoso
dd46dae9ad Include build files for bridge:support presets 2018-10-01 07:18:10 -07:00
Henry Ho
08d330f2df Added build generated files 2018-09-30 21:44:14 -07:00
Quincy Morgan
73c471c612 Adds the traffic_sign/direction field
Replaces the direction_vertex field in the vertex Traffic Sign presets with the traffic_sign/direction field
2018-09-27 17:08:31 -07:00
Quincy Morgan
cd8be8b5b4 Adds presets for Traffic Sign, Speed Limit Sign, and City Limit Sign, each with point/vertex variants to account for different direction fields
Makes the maxspeed field compatible with node entities
2018-09-26 19:35:44 -07:00
Bryan Housel
f3c4eac812 Merge pull request #5316 from quincylvania/add-flagpole-preset-fields
Adds fields to the Flagpole preset
2018-09-18 10:23:39 -04:00
Bryan Housel
ed52922d89 Merge pull request #5310 from quincylvania/scuplture-statue-mural-presets
Adds Sculpture, Statue, and Mural presets
2018-09-18 10:21:56 -04:00
Quincy Morgan
5b482d1ad4 Renames and moves flag_type.json preset field file to flag/type.json 2018-09-17 16:44:21 -07:00
Quincy Morgan
d509649458 Merge branch 'master' into add-flagpole-preset-fields 2018-09-17 16:40:30 -07:00
Quincy Morgan
6e7b34d39a Adds the Operator, Country, Lit, Height, and new Flag Type fields to the Flagpole preset 2018-09-16 20:26:41 -07:00