-
Notifications
You must be signed in to change notification settings - Fork 252
Add emergency=fire_service_inlet #806
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
13b135c
Add emergency=fire_service_inlet
fbc1f06
lower case and add a few more entries
tiptoptom bf6059e
Added additional tags.
93914fe
Add fields for fire_mains and fire_sprinkler
2eaf4f8
Add fire_service_inlet
133493a
Update data/fields/fire_mains.json
tiptoptom 9087d64
Update data/fields/fire_sprinkler.json
tiptoptom 7d37a02
Update data/presets/emergency/fire_service_inlet.json
tiptoptom 31ea2f2
switch fire_service_inlet and fire_sprinkler
a068a43
missing quotation mark added
459e182
missing comma added
938dbb7
add ref field
281092d
Icon chanched
a3a59a6
Improved formulation
37ba959
Merge branch 'main' into HEAD
tyrasd fa17233
Merge branch 'main' into fire-service-inlet
tyrasd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "key": "fire_mains", | ||
| "type": "combo", | ||
| "label": "Type", | ||
| "strings": { | ||
| "options": { | ||
| "dry": "Dry Riser Inlet", | ||
| "wet": "Charged Riser", | ||
| "yes": "yes", | ||
|
tiptoptom marked this conversation as resolved.
Outdated
|
||
| "no": "no" | ||
|
tiptoptom marked this conversation as resolved.
Outdated
|
||
| } | ||
| }, | ||
| "autoSuggestions": false, | ||
| "customValues": false | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "key": "fire_service_inlet", | ||
| "type": "combo", | ||
| "label": "Shape", | ||
| "strings": { | ||
| "options": { | ||
| "pillar": "Pillar/Aboveground", | ||
| "underground": "Underground", | ||
| "wall": "Wall", | ||
| "pipe": "Capped Pipe" | ||
| } | ||
| }, | ||
| "autoSuggestions": false, | ||
| "customValues": false | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "key": "fire_sprinkler", | ||
| "type": "combo", | ||
| "label": "Fire Sprinkler Inlet", | ||
| "strings": { | ||
| "options": { | ||
| "dry": "dry", | ||
| "wet": "wet", | ||
| "pre-action": "pre-action", | ||
| "yes": "yes", | ||
| "no": "no" | ||
|
tiptoptom marked this conversation as resolved.
Outdated
|
||
| } | ||
| }, | ||
| "autoSuggestions": false, | ||
| "customValues": false | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "icon": "temaki-fire_hydrant", | ||
|
tyrasd marked this conversation as resolved.
Outdated
|
||
| "fields": [ | ||
| "fire_mains", | ||
| "fire_service_inlet", | ||
| "couplings" | ||
| ], | ||
| "moreFields": [ | ||
| "level", | ||
| "survey/date", | ||
| "fire_sprinkler" | ||
|
tiptoptom marked this conversation as resolved.
Outdated
|
||
| ], | ||
| "geometry": [ | ||
| "point", | ||
| "vertex" | ||
| ], | ||
| "terms": [ | ||
| "building hydrant inlet", | ||
| "charged riser", | ||
| "dry riser inlet", | ||
| "dry standpipe", | ||
| "fdc", | ||
| "fire service inlet", | ||
| "fire sprinkler inlet", | ||
| "riser inlet", | ||
| "wet riser inlet" | ||
|
tiptoptom marked this conversation as resolved.
Outdated
|
||
| ], | ||
| "tags": { | ||
| "emergency": "fire_service_inlet" | ||
| }, | ||
| "name": "Fire Department Connection" | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need to clarify that this Type is only supposed to represent the non-sprinkler part of the inlet. Maybe just calling it Riser Inlet (or Standpipe) would be better?!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that is clear enough.
emergency=fire_service_inletis basically only about the inlet. So I think Riser Inlet or Standpipe would only lead to confusion.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or maybe 'System-Type'?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changed it in
Network-Type. I think this should be clear now.