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

jackgrossman18 · 2019-05-08T17:41:26Z

maxgrossman · 2019-05-17T14:44:43Z

modules/Hoot/managers/api.js

+    /**
+     * Get all id's necessary to create new map features
+     *
+     * @param {Promise|array} mapId + changesetId, nodeId, wayId, relationId


Just a reminder, let's update this comment!

maxgrossman · 2019-05-17T14:44:56Z

modules/Hoot/managers/api.js

+        return this.request( params )
+            .then( resp =>  {
+
+                let activeIds = {};


I think just return resp.data!

maxgrossman · 2019-05-17T14:46:00Z

modules/Hoot/ui/sidebar/sidebar.js

@@ -15,6 +15,7 @@ import {
    utilQsString,
    utilStringQs
 } from '../../../util';
+import { diff3MergeIndices } from 'node-diff3';


think we can remove this import!

maxgrossman · 2019-05-17T15:12:36Z

modules/behavior/draw_way.js

@@ -73,6 +74,8 @@ export function behaviorDrawWay(context, wayId, index, mode, startGraph) {
    function move(datum) {
        context.surface().classed('nope-disabled', d3_event.altKey);

+    // add one more boolean at end, is activeLayer===mapId
+        var _activeLayer = _find( Hoot.layers.loadedLayers, function(a, b) { return a.activeLayer; });


I think we need to make use of this here, making sure to only apply a target loc if active ids match.

here in iD a question is asked (is this target loc one that allows vertex).

Our question needs to be does the datum's mapId equal the _activeLayer mapId

maxgrossman · 2019-05-17T15:21:15Z

modules/osm/entity.js


+        var _activeLayer = _find(Hoot.layers.loadedLayers, function(a, b) { return a.activeLayer; });
+        if (_activeLayer && _activeLayer.id) {


totally just a stylistic suggestion, so no need to change, but I almost wonder if we should make a new func for grabbing the ids from the active layer. something like osmEntity.id.hoot that looks a little like this...

function(type, activeLayer) { return osmEntity.id.fromOsm(type, activeLayer.activeIds[type]--) + '_' + activeLayer.id; }

Then here in this if block you just say "do I have an activeLayer'?
Ok I do, use id.hoot function
If I don't use the out of the box id way of doing things.

just a thought!

jackgrossman18 · 2019-05-21T19:17:23Z

@maxgrossman please take a look at the most recent changes

maxgrossman · 2019-05-23T14:25:00Z

modules/Hoot/ui/sidebar/sidebar.js

+            let changeActive    = new LayerAdd();
+
+
+            if (d3.select('#reference button.select-active-layer').empty()) {


wonder if the on click callback can be generalized in a single function? seems like when we click one fo the active layer buttons, we make the one we click's classes all set to active, and the other one's set to false. so a function could have 2 params, one we want to set to active, one we want to disable and just use those accordingly.

so naively, something like

function update(active, inactive) { //...update active button class //...update inactive button }

maxgrossman · 2019-05-23T14:26:46Z

modules/behavior/draw_way.js

@@ -279,6 +287,8 @@ export function behaviorDrawWay(context, wayId, index, mode, startGraph) {

    // Connect the way to an existing node and continue drawing.
    drawWay.addNode = function(node, d) {
+        console.log(node);


let's remove the stray console logs

maxgrossman · 2019-05-23T14:31:53Z

modules/behavior/draw_way.js

@@ -73,7 +75,9 @@ export function behaviorDrawWay(context, wayId, index, mode, startGraph) {
    function move(datum) {
        context.surface().classed('nope-disabled', d3_event.altKey);

+        var _activeLayer = _find( Hoot.layers.loadedLayers, function(a,b) { return a.activeLayer; });
        var targetLoc = datum && datum.properties && datum.properties.entity && datum.properties.entity.loc;


I think we need to implement the commented out piece here, using the same split stuff we do in the draw.js file.

maxgrossman · 2019-05-23T14:32:52Z

modules/behavior/hover.js

@@ -140,6 +140,7 @@ export function behaviorHover(context) {
                    return;
                }

+				// again, boolean, is entity.mapId === activeLayerId...
                var suppressed = _altDisables && d3_event && d3_event.altKey;


need to do same is this the active layer check here too

maxgrossman · 2019-05-23T14:34:23Z

modules/osm/entity.js

+    var _activeLayer = _find(Hoot.layers.loadedLayers, function(a, b) { return a.activeLayer; });
+    let allIds = {};
+    allIds = _activeLayer.activeIds;
+    var id = osmEntity.id.fromOSM(type, allIds[type]--);


I think you can call the _activeLayer.activeIds directly inside the fromOsm function _activeLayer.activeIds[type]--

maxgrossman · 2019-05-23T14:34:52Z

modules/services/osm.js

@@ -41,6 +42,7 @@ import {
 } from '../util';

 import { baseUrl as hootBaseUrl } from '../Hoot/config/apiConfig';
+import { all } from 'q';


import to remove I do believe

maxgrossman · 2019-05-23T14:34:57Z

modules/services/osm.js

@@ -8,6 +8,7 @@ import _flatten from 'lodash-es/flatten';
 import _groupBy from 'lodash-es/groupBy';
 import _isEmpty from 'lodash-es/isEmpty';
 import _map from 'lodash-es/map';
+import _matches from 'lodash-es/matches';


import to remove

…eLayer

jackgrossman18 · 2019-06-04T18:43:13Z

@maxgrossman please take a look at the new changes

maxgrossman · 2019-06-05T16:26:10Z

The changeset upload logic is 👨‍🍳 💋 - made changes to both the secondary and reference datasets, then checked their respective changesets/nodes tables. they had the right changes. Awesome job.

In addition to those comments, I found these bugs.

sometimes I can't double click off when finishing drawing a way.

I cannot drag nodes that belong to features within the currently active layer

If you notice in the first gif how the icon changes. I think that indicates the mode is changing. For debugging why this is happening, it might be helpful to look at the context's exit and enter methods since they tell you when the modes are being switched.

#1425

ref #1425

refs #1425

ref #1425

# Conflicts: # modules/Hoot/managers/api.js # package-lock.json

… lyrs

jackgrossman18 · 2019-06-20T18:49:00Z

@maxgrossman @brianhatchl this is ready for review

Jack Grossman added 2 commits May 7, 2019 16:36

working on removing changeset error when editing w/ 2 layer in map

960b532

can create new &/or edit existing features then save to selected layer

eb95c0b

jackgrossman18 requested a review from maxgrossman May 8, 2019 17:41

Jack Grossman and others added 3 commits May 8, 2019 15:16

updated to account for deleting and adding new layers to map

ce6f3cf

working on suppressing drawing for non-active layer

8d9ab10

comments...

fac2925

ref #1425

jackgrossman18 mentioned this pull request May 13, 2019

Create proper entity attribute id for uploaded layer with > 1 layer in map ngageoint/hootenanny#3196

Closed

working on inflight error

14cf7f2

maxgrossman reviewed May 17, 2019

View reviewed changes

can now add or edit layers /w 2 in map when proper active layer selected

70c4f1d

maxgrossman reviewed May 23, 2019

View reviewed changes

Jack Grossman added 5 commits May 31, 2019 12:20

working on synchronizing all draw behaviors with new activeLayer setup

7e89286

can now successfully upload changes made to two separate map layers

bd72f67

updated datum and activeLayer id checks in select.js class

7faae87

updating draw methods accounting for single layer editing w new activ…

ae33772

…eLayer

behaviors added to include activeLayer settings when only 1 layer in map

16e099a

updated behaviors to prevent unwanted hovering over non-active layers

16b2fd8

Jack Grossman and others added 15 commits June 10, 2019 14:55

removed parsing of active layer id

ba9dda2

updating for failing jenkins tests

1f0ec99

fix behabior test

42af31c

#1425

fix history tests

21d8219

#1425

fix entity tests

76fabe0

ref #1425

fix some intersection/svglines test

305efc5

refs #1425

don't comment out all the tests!

2b2693b

ref #1425

keep using same intersection

7e8a0de

ref #1425

update intersection regexc

2f78207

ref #1425

remove timeout

73f53a4

ref #1425

Merge branch 'hoot2x' into 1425

0ec1437

# Conflicts: # modules/Hoot/managers/api.js # package-lock.json

Merge branch '1425' of github.com:ngageoint/hootenanny-ui into 1425

3207b64

merged hoot2x

44371a1

updated sidebar to prevent page from refreshing when switching active…

3819c61

… lyrs

updated layer keys in layerManager

1e3bda4

removed unused vars

e2179df

maxgrossman modified the milestone: Hootenanny Sprint 2019-07-24 Jul 9, 2019

maxgrossman modified the milestones: Hootenanny Sprint 2019-07-24, Hootenanny Sprint 2019-08-07 Jul 23, 2019

maxgrossman modified the milestones: Hootenanny Sprint 2019-08-07, Hootenanny Sprint 2019-08-21 Aug 6, 2019

maxgrossman modified the milestones: Hootenanny Sprint 2019-08-21, Hootenanny 2019-09-04 Aug 20, 2019

maxgrossman modified the milestones: Hootenanny 2019-09-04, Hootenanny 2019-10-02 Sep 17, 2019

maxgrossman modified the milestones: Hootenanny 2019-10-02, Hootenanny 2019-10-16 Oct 1, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

jackgrossman18 commented May 8, 2019

maxgrossman May 17, 2019

maxgrossman May 17, 2019

maxgrossman May 17, 2019

maxgrossman May 17, 2019 •

edited

Loading

maxgrossman May 17, 2019

jackgrossman18 commented May 21, 2019

maxgrossman May 23, 2019

maxgrossman May 23, 2019 •

edited

Loading

maxgrossman May 23, 2019

maxgrossman May 23, 2019 •

edited

Loading

maxgrossman May 23, 2019

maxgrossman May 23, 2019 •

edited

Loading

maxgrossman May 23, 2019 •

edited

Loading

jackgrossman18 commented Jun 4, 2019

maxgrossman commented Jun 5, 2019

jackgrossman18 commented Jun 20, 2019


		var _activeLayer = _find(Hoot.layers.loadedLayers, function(a, b) { return a.activeLayer; });
		if (_activeLayer && _activeLayer.id) {

		let changeActive = new LayerAdd();


		if (d3.select('#reference button.select-active-layer').empty()) {

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

Are you sure you want to change the base?

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

Conversation

jackgrossman18 commented May 8, 2019

maxgrossman May 17, 2019

Choose a reason for hiding this comment

maxgrossman May 17, 2019

Choose a reason for hiding this comment

maxgrossman May 17, 2019

Choose a reason for hiding this comment

maxgrossman May 17, 2019 • edited Loading

Choose a reason for hiding this comment

maxgrossman May 17, 2019

Choose a reason for hiding this comment

jackgrossman18 commented May 21, 2019

maxgrossman May 23, 2019

Choose a reason for hiding this comment

maxgrossman May 23, 2019 • edited Loading

Choose a reason for hiding this comment

maxgrossman May 23, 2019

Choose a reason for hiding this comment

maxgrossman May 23, 2019 • edited Loading

Choose a reason for hiding this comment

maxgrossman May 23, 2019

Choose a reason for hiding this comment

maxgrossman May 23, 2019 • edited Loading

Choose a reason for hiding this comment

maxgrossman May 23, 2019 • edited Loading

Choose a reason for hiding this comment

jackgrossman18 commented Jun 4, 2019

maxgrossman commented Jun 5, 2019

sometimes I can't double click off when finishing drawing a way.

I cannot drag nodes that belong to features within the currently active layer

jackgrossman18 commented Jun 20, 2019

maxgrossman May 17, 2019 •

edited

Loading

maxgrossman May 23, 2019 •

edited

Loading

maxgrossman May 23, 2019 •

edited

Loading

maxgrossman May 23, 2019 •

edited

Loading

maxgrossman May 23, 2019 •

edited

Loading