-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Indoor mode #3097
Closed
Closed
Indoor mode #3097
Changes from 34 commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
aa11306
indoor: ui-control attempts
zbycz 24cfd5e
indoor: ui-control works, needs refactor
zbycz 57bead6
indoor: ui-control refactoring
zbycz 26c8a54
indoor: basic rendering
zbycz d67fafa
indoor: choose level of selected entitry
zbycz c9bf632
indoor: refactor event name
zbycz 5fde1b6
indoor: hide building label-icons (added classes)
zbycz 86a25e7
indoor: new objects with correct level
zbycz 493147d
indoor: moved filter to features
zbycz 757306a
indoor: fix build
zbycz c2a67fa
indoor: fix hiding building label
zbycz c1be9e2
indoor: better indoor-mode control with +-
zbycz ca7ed19
indoor: refactored filtering using features.indoor
zbycz 439753c
indoor: fix showing relevant points
zbycz 7f53f2b
indoor: fix default tags on new entities
zbycz bd8d92f
indoor: level=* without whitespace
zbycz 5f96d62
indoor: hidden lower buildings then "current level"
zbycz 3cd9ef3
indoor: hide surroundings for level < 0
zbycz 04f19a1
indoor: supress losing selection when exiting indoor-mode
zbycz e4d5f58
indoor: level parameter in url
zbycz 1fbad7f
indoor: hide "building" icon for amenity
zbycz aced1a4
indoor: fix - correct hiding of vertexes
zbycz f2c9118
indoor: mandatory level, optional repeat_on
zbycz dbee347
indoor: hide other buildings underground
zbycz 1719fc2
indoor: translations
zbycz ddbd92a
indoor: styles for underground view
zbycz 1309b18
indoor: inspector - indoor_levels field + ui.preset.range
zbycz 507878d
indoor: refactoring context.indoor() to separate file
zbycz 50d4d8d
indoor: show button when level=* feature in viewport
zbycz b5309d3
indoor: map redraw on event
zbycz ce1288f
indoor: eslint
zbycz 6a8a3ad
indoor: refactoring + codestyle
zbycz 4bacbdf
indoor: style changes from user testing
zbycz ce6de5c
indoor: add tests
zbycz 3f1803b
indoor: fix decimal levels regexp + test
zbycz 3f5097b
indoor: tagging - repeat_on means discreet values
zbycz a57c92e
indoor: refactor inRange() to indoor file
zbycz 5edb261
indoor: switching floors using decimal values (if exist)
zbycz b37ccca
indoor: build english and presets
zbycz 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 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
This file contains 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
This file contains 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 |
---|---|---|
|
@@ -1307,6 +1307,44 @@ path.fill.tag-amenity-shelter { | |
} | ||
|
||
|
||
/* Indoor features */ | ||
path.fill.tag-indoor { | ||
display: none; | ||
} | ||
.indoor-mode path.fill.tag-building.tag-max_level { | ||
clip-path: none !important; | ||
stroke-width: 30px; | ||
} | ||
.indoor-mode path.way.area.stroke.tag-building.tag-max_level { | ||
stroke-width: 6px; | ||
} | ||
.indoor-mode path.fill.tag-indoor { | ||
display: block; | ||
fill: rgba(169, 169, 169, 0.3); | ||
stroke-width: 30px; | ||
} | ||
.indoor-mode path.stroke.tag-indoor { | ||
stroke: rgb(169, 169, 169); | ||
} | ||
.indoor-mode path.stroke.tag-indoor-corridor { | ||
opacity: 0.1; | ||
} | ||
.indoor-mode use.icon.areaicon.tag-building, | ||
.indoor-mode use.icon.areaicon.tag-amenity, | ||
.indoor-mode text.arealabel.tag-building, | ||
.indoor-mode text.arealabel.tag-amenity, | ||
.indoor-mode text.arealabel-halo.tag-building, | ||
.indoor-mode text.arealabel-halo.tag-amenity { | ||
display: none; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I`m not sure this is the right way to hide the building icon+label. It possibly breaks if other tags get precedence over building=* or amenity=* and shows its icon. Then it wouldnt be hidden. Can you think of a better way, please? Or do you think its fine this way? |
||
.indoor-mode .way:not(.tag-level):not(.tag-building) { | ||
opacity: 0.1; | ||
} | ||
.indoor-mode.indoor-underground .way:not(.tag-level):not(.tag-building) { | ||
opacity: 0.05; | ||
} | ||
|
||
|
||
/* Labels / Markers */ | ||
|
||
text { | ||
|
This file contains 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
This file contains 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
This file contains 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
This file contains 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,13 @@ | ||
{ | ||
"keys": [ | ||
"min_level", | ||
"max_level" | ||
], | ||
"type": "range", | ||
"label": "Indoor levels (min - max)", | ||
"universal": true, | ||
"strings": { | ||
"placeholder-0": "-1, 0, 1, 3...", | ||
"placeholder-1": "3, 5, 10..." | ||
} | ||
} |
This file contains 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,5 @@ | ||
{ | ||
"key": "repeat_on", | ||
"type": "combo", | ||
"label": "Repeat on" | ||
} |
This file contains 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
This file contains 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 |
---|---|---|
|
@@ -2,7 +2,8 @@ | |
"icon": "building", | ||
"fields": [ | ||
"address", | ||
"levels" | ||
"levels", | ||
"indoor_levels" | ||
], | ||
"geometry": [ | ||
"area" | ||
|
This file contains 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 |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"fields": [ | ||
"address", | ||
"levels", | ||
"indoor_levels", | ||
"smoking" | ||
], | ||
"geometry": [ | ||
|
This file contains 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 |
---|---|---|
|
@@ -2,7 +2,8 @@ | |
"icon": "building", | ||
"fields": [ | ||
"address", | ||
"levels" | ||
"levels", | ||
"indoor_levels" | ||
], | ||
"geometry": [ | ||
"area" | ||
|
This file contains 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 |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"fields": [ | ||
"address", | ||
"levels", | ||
"indoor_levels", | ||
"smoking" | ||
], | ||
"geometry": [ | ||
|
This file contains 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 |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"fields": [ | ||
"address", | ||
"levels", | ||
"indoor_levels", | ||
"smoking" | ||
], | ||
"geometry": [ | ||
|
This file contains 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 |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
"fields": [ | ||
"address", | ||
"levels", | ||
"indoor_levels", | ||
"smoking" | ||
], | ||
"geometry": [ | ||
|
This file contains 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 |
---|---|---|
|
@@ -2,7 +2,8 @@ | |
"icon": "building", | ||
"fields": [ | ||
"address", | ||
"levels" | ||
"levels", | ||
"indoor_levels" | ||
], | ||
"geometry": [ | ||
"area" | ||
|
This file contains 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
Oops, something went wrong.
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.
Because the ui.type.range needs second input without border.
Would you suggest a better selector maybe?