DDF-4652 Add coordinate order handling to HandlebarsWfsFeatureTransfo… #4654

jrnorth · 2019-04-08T23:35:47Z

What does this PR do?

Previously, HandlebarsWfsFeatureTransformer would always reverse the coordinate order of every spatial feature when transforming them to WKT strings even if the coordinates were already in lon/lat order.

This commit adds the ability to configure each HandlebarsWfsFeatureTransformer's feature coordinate order, that is, the coordinate order of its corresponding feature's spatial properties. The coordinate order will only be reversed if the feature coordinate order is lat/lon, since DDF expects WKT strings to be in lon/lat order.

Who is reviewing it?

@dcruver
@leo-sakh
@samuelechu
@brianfelix

Select relevant component teams:

@codice/io

Ask 2 committers to review/merge the PR and tag them here.

@bdeining
@troymohl

How should this be tested?

In the Admin UI, open the Spatial app.
Click WFS Feature to Metacard Templated Mapping.
a. For Feature Type, enter {http://stategeothermaldata.org/uri-gin/aasg/xmlschema/welllog/0.8}WellLog
b. Set the Coordinate Order to Lat/Lon.
c. Add the following to Attribute Mappings: {"attributeName":"location","featureName":"Shape","template":"{{Shape}}"} and {"attributeName":"title","featureName":"DisplayName","template":"{{DisplayName}}"}
d. Click Save changes.
Create a WFS 1.1.0 source with the URL http://services.azgs.az.gov/ArcGIS/services/aasggeothermal/CAWellLogs/MapServer/WFSServer
a. Disable the CN check and allow redirects. Leave everything else as-is.
Open Intrigue, remove the 3D map and add the 2D map.
Run a query for ext.WellLog.LatDegree > 0.
Verify you receive results and they appear in California.
Go back to WFS Feature to Metacard Templated Mapping in the Admin UI, change the coordinate order to Lon/Lat and save the changes.
Run the same query in Intrigue and verify you still receive results but they appear outside the map bounds on the bottom.
Change the coordinate order back to Lat/Lon, rerun the query, and verify the results appear in California again.

Any background context you want to provide?

What are the relevant tickets?

Fixes: #4652

Checklist:

Documentation Updated
Update / Add Threat Dragon models
Update / Add Unit Tests
Update / Add Integration Tests

Notes on Review Process

Please see Notes on Review Process for further guidance on requirements for merging and abbreviated reviews.

Review Comment Legend:

✏️ (Pencil) This comment is a nitpick or style suggestion, no action required for approval. This comment should provide a suggestion either as an in line code snippet or a gist.
❓ (Question Mark) This comment is to gain a clearer understanding of design or code choices, clarification is required but action may not be necessary for approval.
❗ (Exclamation Mark) This comment is critical and requires clarification or action before approval.

jrnorth · 2019-04-09T22:57:51Z

...a/org/codice/ddf/spatial/ogc/wfs/transformer/handlebars/HandlebarsWfsFeatureTransformer.java

@@ -309,7 +308,6 @@ private void readGmlData(
      }
    } finally {
      eventWriter.close();
-      IOUtils.closeQuietly(stringWriter);


Removed because closing a StringWriter has no effect.

jrnorth · 2019-04-09T22:59:36Z

...a/org/codice/ddf/spatial/ogc/wfs/transformer/handlebars/HandlebarsWfsFeatureTransformer.java

@@ -230,7 +230,6 @@ private String getNamespaceAlias(String namespace, Map<String, String> namespace
  private String getIdAttributeValue(
      StartElement startElement, Map<String, String> namespaces, String namespaceAlias) {
    String id = null;
-    startElement.getAttributeByName(new QName(namespaces.get(namespaceAlias), "id")).getValue();


Removed because the getValue() call can cause a NullPointerException when the element has no gml:id attribute. And this statement appears to serve no purpose.

...a/org/codice/ddf/spatial/ogc/wfs/transformer/handlebars/HandlebarsWfsFeatureTransformer.java

catalog/spatial/wfs/spatial-wfs-featuretransformer-handlebars/pom.xml

bdeining · 2019-05-01T14:30:00Z

@jrnorth this one could use a rebase

…rmer Previously, HandlebarsWfsFeatureTransformer would always reverse the coordinate order of every spatial feature when transforming them to WKT strings even if the coordinates were already in lon/lat order. This commit adds the ability to configure each HandlebarsWfsFeatureTransformer's feature coordinate order, that is, the coordinate order of its corresponding feature's spatial properties. The coordinate order will only be reversed if the feature coordinate order is lat/lon, since DDF expects WKT strings to be in lon/lat order.

jrnorth · 2019-05-01T16:37:47Z

build now

cxbot · 2019-05-01T17:15:44Z

Internal build has been scheduled, your results will be available at build completion.

cxbot · 2019-05-02T03:58:27Z

Refer to this link for build results (access rights to CI server needed):
https://jenkins.codice.org/job/DDF-Jobs/job/pr/job/Linux/6646/

Build result: ABORTED

[...truncated 5.04 MB...][WARNING] Failed to notify spy hudson.maven.Maven3Builder$JenkinsEventSpy: java.util.concurrent.ExecutionException: Invalid object ID 167 iota=552[WARNING] Failed to notify spy hudson.maven.Maven3Builder$JenkinsEventSpy: java.util.concurrent.ExecutionException: Invalid object ID 341 iota=552[INFO] [INFO] ------------------------------------------------------------------------[INFO] Building DDF :: Distribution :: Docker :: DDF 2.15.0-SNAPSHOT[INFO] ------------------------------------------------------------------------��[INFO] [INFO] --- fmt-maven-plugin:2.3.0:check (default) @ ddf ---[warn] Source directory '/jenkins/workspace/DDF-Jobs/pr/Linux/distribution/docker/ddf/src/main/java' does not exist, ignoring.[warn] Test source directory '/jenkins/workspace/DDF-Jobs/pr/Linux/distribution/docker/ddf/src/test/java' does not exist, ignoring.[INFO] Processed 0 files (0 non-complying). [] [WARNING] Failed to notify spy hudson.maven.Maven3Builder$JenkinsEventSpy: java.util.concurrent.ExecutionException: Invalid object ID 341 iota=552[INFO] [INFO] --- maven-checkstyle-plugin:3.0.0:check (checkstyle-check) @ ddf ---Set build name.channel stoppedNew build name is 'PR 4654'Taking single-use slave mesos-jenkins-95edcf1fad034e0bb26f4db04d68eaa9-linux-large offline.Build was abortedArchiving artifactsAdding one-line test results to commit status...Setting status of 22359fc to FAILURE with url https://jenkins.codice.org/job/DDF-Jobs/job/pr/job/Linux/6646/ and message: 'JOB FAILURE: https://jenkins.codice.org/job/DDF-Jobs/job/pr/job/Linux/6646/ 24 tests run, 0 skipped, 0 failed.'Using context: Internal CI Pipeline
❌ JOB FAILURE

bdeining · 2019-05-02T14:29:36Z

build now

cxbot · 2019-05-02T14:37:48Z

Internal build has been scheduled, your results will be available at build completion.

bdeining · 2019-05-02T15:09:52Z

verified coordinate order functionality in WFS Feature to Metacard Templated Mapping

cxbot · 2019-05-02T17:41:38Z

Refer to this link for build results (access rights to CI server needed):
https://jenkins.codice.org/job/DDF-Jobs/job/pr/job/Linux/6655/
✅ JOB SUCCESS

lamhuy approved these changes Apr 9, 2019

View reviewed changes

jrnorth commented Apr 9, 2019

View reviewed changes

samuelechu approved these changes Apr 10, 2019

View reviewed changes

bakejeyner approved these changes Apr 12, 2019

View reviewed changes

...a/org/codice/ddf/spatial/ogc/wfs/transformer/handlebars/HandlebarsWfsFeatureTransformer.java Show resolved Hide resolved

catalog/spatial/wfs/spatial-wfs-featuretransformer-handlebars/pom.xml Show resolved Hide resolved

duckbyte added the 📈 Improvement label Apr 16, 2019

bdeining approved these changes Apr 24, 2019

View reviewed changes

troymohl approved these changes May 1, 2019

View reviewed changes

jrnorth force-pushed the wfs-handlebars-coordinate-order branch from 6cb3336 to 22359fc Compare May 1, 2019 16:37

codice deleted a comment May 1, 2019

bdeining mentioned this pull request May 1, 2019

Exception when adding module in DDF codice/acdebugger#51

Open

bdeining merged commit 9507674 into codice:master May 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DDF-4652 Add coordinate order handling to HandlebarsWfsFeatureTransfo… #4654

DDF-4652 Add coordinate order handling to HandlebarsWfsFeatureTransfo… #4654

jrnorth commented Apr 8, 2019 •

edited

Loading

jrnorth Apr 9, 2019

jrnorth Apr 9, 2019

bdeining commented May 1, 2019

jrnorth commented May 1, 2019

cxbot commented May 1, 2019

cxbot commented May 2, 2019

bdeining commented May 2, 2019

cxbot commented May 2, 2019

bdeining commented May 2, 2019

cxbot commented May 2, 2019

DDF-4652 Add coordinate order handling to HandlebarsWfsFeatureTransfo… #4654

DDF-4652 Add coordinate order handling to HandlebarsWfsFeatureTransfo… #4654

Conversation

jrnorth commented Apr 8, 2019 • edited Loading

What does this PR do?

Who is reviewing it?

Select relevant component teams:

Ask 2 committers to review/merge the PR and tag them here.

How should this be tested?

Any background context you want to provide?

What are the relevant tickets?

Checklist:

Notes on Review Process

Review Comment Legend:

jrnorth Apr 9, 2019

Choose a reason for hiding this comment

jrnorth Apr 9, 2019

Choose a reason for hiding this comment

bdeining commented May 1, 2019

jrnorth commented May 1, 2019

cxbot commented May 1, 2019

cxbot commented May 2, 2019

Build result: ABORTED

bdeining commented May 2, 2019

cxbot commented May 2, 2019

bdeining commented May 2, 2019

cxbot commented May 2, 2019

jrnorth commented Apr 8, 2019 •

edited

Loading