Skip to content
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.

Sign up for GitHub

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

PMTiles + enhancements to vector tile data sources in Rapid #1016

Merged
merged 9 commits into from
Aug 10, 2023
Merged

PMTiles + enhancements to vector tile data sources in Rapid #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0cf7e9d
Add support for .pmtiles vector sources
bhousel Aug 1, 2023
9c9249d
`l10n.displayName` functions should accept tags, not entity
bhousel Aug 1, 2023
bbacfda
Cleanup a bunch of stuff involving dataID
bhousel Aug 1, 2023
b08812a
Compute a displayName for each source (e.g. 'places.pmtiles')
bhousel Aug 2, 2023
f00f261
Support some more mime types for json, geojson
bhousel Aug 2, 2023
2834b95
Simplify and standardize more of the service code
bhousel Aug 2, 2023
f1536e7
More cleanups in the VectorTileService
bhousel Aug 10, 2023
cbf2743
Add 'accepts' attribute for accepted file types
bhousel Aug 10, 2023
5c1a71a
Fix styling/css of the custom data editor sidebar
bhousel Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
249 changes: 108 additions & 141 deletions css/80_app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2678,240 +2678,207 @@ img.tag-reference-wiki-image {
}


/* OSM Note / QA Editors
/* OSM Note / QA Editors / Custom Data Editor
------------------------------------------------------- */
.data-header,
.note-header,
.qa-header {
background-color: #f6f6f6;
border-radius: 5px;
border: 1px solid #ccc;
display: flex;
flex-flow: row nowrap;
align-items: center;
background-color: #f6f6f6;
border-radius: 5px;
border: 1px solid #ccc;
display: flex;
flex-flow: row nowrap;
align-items: center;
}

.data-header-icon,
.note-header-icon,
.qa-header-icon {
background-color: #fff;
padding: 10px;
flex: 0 0 auto;
position: relative;
width: 60px;
height: 60px;
border-right: 1px solid #ccc;
border-radius: 5px 0 0 5px;
}
background-color: #fff;
padding: 10px;
flex: 0 0 auto;
position: relative;
width: 60px;
height: 60px;
border-right: 1px solid #ccc;
border-radius: 5px 0 0 5px;
}
.ideditor[dir='rtl'] .data-header-icon,
.ideditor[dir='rtl'] .note-header-icon,
.ideditor[dir='rtl'] .qa-header-icon {
border-right: unset;
border-left: 1px solid #ccc;
border-radius: 0 5px 5px 0;
border-right: unset;
border-left: 1px solid #ccc;
border-radius: 0 5px 5px 0;
}

.data-header-icon .icon-wrap,
.note-header-icon .icon-wrap,
.qa-header-icon .icon-wrap {
position: absolute;
top: 0px;
position: absolute;
top: 0px;
}

.preset-icon-28 {
position: absolute;
top: 16px;
left: 16px;
margin: auto;
position: absolute;
top: 16px;
left: 16px;
margin: auto;
}
.preset-icon-28 .icon {
width: 28px;
height: 28px;
width: 28px;
height: 28px;
}

.data-header-label,
.note-header-label,
.qa-header-label {
background-color: #f6f6f6;
padding: 0 15px;
flex: 1 1 100%;
font-size: 14px;
font-weight: bold;
border-radius: 0 5px 5px 0;
}
background-color: #f6f6f6;
padding: 0 15px;
flex: 1 1 100%;
font-size: 14px;
font-weight: bold;
border-radius: 0 5px 5px 0;
}
.ideditor[dir='rtl'] .data-header-label,
.ideditor[dir='rtl'] .note-header-label,
.ideditor[dir='rtl'] .qa-header-label {
border-radius: 5px 0 0 5px;
border-radius: 5px 0 0 5px;
}

.note-category {
margin: 20px 0px;
margin: 20px 0px;
}

.comments-container {
background: #ececec;
padding: 1px 10px;
border-radius: 8px;
margin-top: 20px;
background: #ececec;
padding: 1px 10px;
border-radius: 8px;
margin-top: 20px;
}

.comment {
background-color: #fff;
border-radius: 5px;
border: 1px solid #ccc;
margin: 10px auto;
display: flex;
flex-flow: row nowrap;
background-color: #fff;
border-radius: 5px;
border: 1px solid #ccc;
margin: 10px auto;
display: flex;
flex-flow: row nowrap;
}
.comment-avatar {
padding: 10px;
flex: 0 0 auto;
padding: 10px;
flex: 0 0 auto;
}
.comment-avatar .icon.comment-avatar-icon {
width: 40px;
height: 40px;
object-fit: cover;
border: 1px solid #ccc;
border-radius: 20px;
width: 40px;
height: 40px;
object-fit: cover;
border: 1px solid #ccc;
border-radius: 20px;
}
.comment-main {
padding: 10px 10px 10px 0;
flex: 1 1 100%;
flex-flow: column nowrap;
overflow: hidden;
overflow-wrap: break-word;
padding: 10px 10px 10px 0;
flex: 1 1 100%;
flex-flow: column nowrap;
overflow: hidden;
overflow-wrap: break-word;
}
.ideditor[dir='rtl'] .comment-main {
padding: 10px 0 10px 10px;
padding: 10px 0 10px 10px;
}

.comment-metadata {
flex-flow: row nowrap;
justify-content: space-between;
flex-flow: row nowrap;
justify-content: space-between;
}
.comment-author {
font-weight: bold;
color: #333;
font-weight: bold;
color: #333;
}
.comment-date {
color: #aaa;
color: #aaa;
}
.comment-text {
color: #333;
margin-top: 10px;
overflow-y: auto;
max-height: 250px;
color: #333;
margin-top: 10px;
overflow-y: auto;
max-height: 250px;
}
.comment-text::-webkit-scrollbar {
border-left: none;
border-left: none;
}

.note-save,
.qa-save {
padding-top: 20px;
padding-top: 20px;
}

.qa-details-container {
background: #ececec;
padding: 10px;
margin-top: 20px;
border-radius: 4px;
border: 1px solid #ccc;
display: flex;
flex-direction: column;
background: #ececec;
padding: 10px;
margin-top: 20px;
border-radius: 4px;
border: 1px solid #ccc;
display: flex;
flex-direction: column;
}
.qa-details-description-text::first-letter {
text-transform: capitalize;
text-transform: capitalize;
}
.ideditor[dir='rtl'] .qa-details-description-text::first-letter {
text-transform: none; /* #5877 */
text-transform: none; /* iD#5877 */
}
.qa-details-subsection h4 {
padding-bottom: 2px;
padding-bottom: 2px;
}
.qa-details-subsection:not(:last-child) {
margin-bottom: 10px;
margin-bottom: 10px;
}
.qa-details-subsection:empty {
display: none;
display: none;
}

.note-save .new-comment-input,
.qa-save .new-comment-input {
width: 100%;
height: 100px;
max-height: 300px;
min-height: 100px;
width: 100%;
height: 100px;
max-height: 300px;
min-height: 100px;
}

.note-save .detail-section,
.qa-save .detail-section {
margin: 10px 0;
margin: 10px 0;
}

.note-report {
float: right;
float: right;
}

.qa-header-icon {
display: flex;
align-items: center;
justify-content: center;
display: flex;
align-items: center;
justify-content: center;
}
.qa-header-icon .qaItem {
scale: 1.8;
}


/* Custom Data Editor
------------------------------------------------------- */
.data-header {
background-color: #f6f6f6;
border-radius: 5px;
border: 1px solid #ccc;
display: flex;
flex-flow: row nowrap;
align-items: center;
/* data editor contains a custom raw-tag-editor without info/add/delete buttons */
.data-tag-editor {
padding: 20px;
}

.data-header-icon {
background-color: #fff;
padding: 10px;
flex: 0 0 auto;
position: relative;
width: 60px;
height: 60px;
border-right: 1px solid #ccc;
border-radius: 5px 0 0 5px;
}
.ideditor[dir='rtl'] .data-header-icon {
border-right: unset;
border-left: 1px solid #ccc;
border-radius: 0 5px 5px 0;
}

.data-header-icon .icon-wrap {
position: absolute;
top: 0px;
}

.data-header-label {
background-color: #f6f6f6;
padding: 0 15px;
flex: 1 1 100%;
font-size: 14px;
font-weight: bold;
border-radius: 0 5px 5px 0;
.data-tag-editor button.add-tag,
.data-tag-editor .tag-row button {
display: none;
}
.ideditor[dir='rtl'] .data-header-label {
border-radius: 5px 0 0 5px;
}

/* custom data editor - no info/delete buttons */
.data-editor.raw-tag-editor .tag-row button {
display: none;
}
.data-editor.raw-tag-editor .tag-row .key-wrap,
.data-editor.raw-tag-editor .tag-row .value-wrap {
width: 50%;
.data-tag-editor .tag-row .key-wrap,
.data-tag-editor .tag-row .value-wrap {
width: 50%;
}


/* Over Map
------------------------------------------------------- */
.over-map {
position: relative;
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions modules/behaviors/AbstractBehavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export class AbstractBehavior extends EventEmitter {
layer: feature.layer,
layerID: feature.layer.id,
data: feature.data,
dataID: feature.data?.id
dataID: feature.dataID
};
return result;
}
Expand All @@ -143,7 +143,7 @@ export class AbstractBehavior extends EventEmitter {
layer: feature.layer,
layerID: feature.layer.id,
data: feature.data,
dataID: feature.data?.id
dataID: feature.dataID
};
return result;
}
Expand Down
Loading