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

Resolving Changeset already inflight error when editing with 2 layers w/in map #1427

Open
wants to merge 36 commits into
base: hoot2x
Choose a base branch
from
+4,791 −3,461
Open

Resolving Changeset already inflight error when editing with 2 layers w/in map #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
960b532
working on removing changeset error when editing w/ 2 layer in map
May 7, 2019
eb95c0b
can create new &/or edit existing features then save to selected layer
May 8, 2019
ce6f3cf
updated to account for deleting and adding new layers to map
May 8, 2019
8d9ab10
working on suppressing drawing for non-active layer
May 13, 2019
fac2925
comments...
maxgrossman May 13, 2019
14cf7f2
working on inflight error
May 17, 2019
70c4f1d
can now add or edit layers /w 2 in map when proper active layer selected
May 21, 2019
7e89286
working on synchronizing all draw behaviors with new activeLayer setup
May 31, 2019
bd72f67
can now successfully upload changes made to two separate map layers
May 31, 2019
7faae87
updated datum and activeLayer id checks in select.js class
Jun 3, 2019
ae33772
updating draw methods accounting for single layer editing w new activ…
Jun 3, 2019
16e099a
behaviors added to include activeLayer settings when only 1 layer in map
Jun 4, 2019
16b2fd8
updated behaviors to prevent unwanted hovering over non-active layers
Jun 5, 2019
7a390cb
fixed active node dragging, updated highlighting, now only active layer
Jun 6, 2019
5c988cb
conditional fix for way's finishDraw methods
Jun 6, 2019
875eac7
css switching update
Jun 7, 2019
d7182f4
added activeLayer check when removing layers, updated verticies svg c…
Jun 7, 2019
87d9353
added null check, revert to defaultFolder in domMetadata
Jun 10, 2019
a741581
Merge branch 'hoot2x' into 1425
Jun 10, 2019
fd82f8f
updating svg classes for proper activeLayer checking
Jun 10, 2019
ba9dda2
removed parsing of active layer id
Jun 10, 2019
1f0ec99
updating for failing jenkins tests
Jun 10, 2019
42af31c
fix behabior test
maxgrossman Jun 12, 2019
21d8219
fix history tests
maxgrossman Jun 12, 2019
76fabe0
fix entity tests
maxgrossman Jun 12, 2019
305efc5
fix some intersection/svglines test
maxgrossman Jun 12, 2019
2b2693b
don't comment out all the tests!
maxgrossman Jun 12, 2019
7e8a0de
keep using same intersection
maxgrossman Jun 12, 2019
2f78207
update intersection regexc
maxgrossman Jun 12, 2019
73f53a4
remove timeout
maxgrossman Jun 12, 2019
0ec1437
Merge branch 'hoot2x' into 1425
Jun 14, 2019
3207b64
Merge branch '1425' of github.com:ngageoint/hootenanny-ui into 1425
Jun 14, 2019
44371a1
merged hoot2x
Jun 14, 2019
3819c61
updated sidebar to prevent page from refreshing when switching active…
Jun 17, 2019
1e3bda4
updated layer keys in layerManager
Jun 19, 2019
e2179df
removed unused vars
Jun 20, 2019
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
56 changes: 56 additions & 0 deletions css/80_app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,15 @@ button.disabled {
border-radius: 4px 0 0 4px;
}

.select-active-layer {
width: -webkit-fill-available;
font-weight: bold;
}


.button-active {
background: #e6e3e3;
}

/* Action buttons */
button.action {
Expand All @@ -359,6 +368,53 @@ button[disabled].action:hover {
cursor: not-allowed;
}

.disable-non-active,
.disable-non-active:hover {
background-color: #fff;
} /* cursor: not-allowed; */


.active-pulse {
border-radius: 50%;
background: #cccccc;
cursor: pointer;
box-shadow: 0 0 0 rgba(136,136,136, 0.4);
animation: active-pulse 2.5s infinite;
}
.active-pulse:hover {
animation: none;
}

@-webkit-keyframes active-pulse {
0% {
-webkit-box-shadow: 0 0 0 0 rgba(136,136,136, 0.4);
}
70% {
-webkit-box-shadow: 0 0 0 10px rgba(136,136,136, 0);
}
100% {
-webkit-box-shadow: 0 0 0 0 rgba(136,136,136, 0);
}
}
@keyframes active-pulse {
0% {
-moz-box-shadow: 0 0 0 0 rgba(136,136,136, 0.4);
box-shadow: 0 0 0 0 rgba(136,136,136, 0.4);
}
70% {
-moz-box-shadow: 0 0 0 10px rgba(136,136,136, 0);
box-shadow: 0 0 0 10px rgba(136,136,136, 0);
}
100% {
-moz-box-shadow: 0 0 0 0 rgba(136,136,136, 0);
box-shadow: 0 0 0 0 rgba(136,136,136, 0);
}
}

/* .no-click {
pointer-events: none;
} */


/* Icons
------------------------------------------------------- */
Expand Down
4 changes: 2 additions & 2 deletions modules/Hoot/config/domMetadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export function layerConflateForm( data ) {
id: 'conflateFolderPath',
class: 'path-name',
inputType: 'combobox',
value: this.defaultFolder ? this.defaultFolder.name : 'root',
_value: this.defaultFolder ? this.defaultFolder.id : 0,
value: this.defaultFolder.name,
_value: this.defaultFolder.id,
data: this.folderList,
itemKey: 'path',
_valueKey: 'id',
Expand Down
Loading