You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/03/21 16:39:39 UTC
[incubator-streampipes-extensions] branch dev updated (0f610d6 ->
252606b)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git.
from 0f610d6 Merge branch 'dev' of github.com:apache/incubator-streampipes-extensions into dev
new 43107f0 Use correct timestamp in ISS adapter
new 252606b Add processors-geo-jvm to pipeline-elements-all module
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../streampipes/connect/adapters/iss/IssAdapter.java | 3 +--
streampipes-pipeline-elements-all-jvm/pom.xml | 6 ++++++
.../streampipes/pe/jvm/AllPipelineElementsInit.java | 14 +++++++++++++-
streampipes-processors-geo-jvm/pom.xml | 15 +++++++++++++++
4 files changed, 35 insertions(+), 3 deletions(-)
[incubator-streampipes-extensions] 01/02: Use correct timestamp in
ISS adapter
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit 43107f0a025d26571db9d176d8be246ffa5d1b53
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Mar 21 17:39:02 2020 +0100
Use correct timestamp in ISS adapter
---
.../java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
index 2448789..310602c 100644
--- a/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
+++ b/streampipes-connect-adapters/streampipes-connect-adapter/src/main/java/org/apache/streampipes/connect/adapters/iss/IssAdapter.java
@@ -24,7 +24,6 @@ import org.apache.http.client.fluent.Request;
import org.apache.streampipes.connect.adapter.Adapter;
import org.apache.streampipes.connect.adapter.exception.AdapterException;
import org.apache.streampipes.connect.adapter.exception.ParseException;
-import org.apache.streampipes.connect.adapter.sdk.ParameterExtractor;
import org.apache.streampipes.connect.adapter.util.PollingSettings;
import org.apache.streampipes.connect.adapters.PullAdapter;
import org.apache.streampipes.connect.adapters.iss.model.IssModel;
@@ -97,7 +96,7 @@ public class IssAdapter extends PullAdapter {
private Map<String, Object> asMap(IssModel issModel) {
Map<String, Object> event = new HashMap<>();
- event.put(Timestamp, issModel.getTimestamp());
+ event.put(Timestamp, issModel.getTimestamp() * 1000);
event.put(Latitude, issModel.getIssPosition().getLatitude());
event.put(Longitude, issModel.getIssPosition().getLongitude());
[incubator-streampipes-extensions] 02/02: Add processors-geo-jvm to
pipeline-elements-all module
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit 252606bcaa3e2e8f1333c69a28853dd64924a1c9
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Mar 21 17:39:20 2020 +0100
Add processors-geo-jvm to pipeline-elements-all module
---
streampipes-pipeline-elements-all-jvm/pom.xml | 6 ++++++
.../streampipes/pe/jvm/AllPipelineElementsInit.java | 14 +++++++++++++-
streampipes-processors-geo-jvm/pom.xml | 15 +++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/streampipes-pipeline-elements-all-jvm/pom.xml b/streampipes-pipeline-elements-all-jvm/pom.xml
index 151a2bb..b811172 100644
--- a/streampipes-pipeline-elements-all-jvm/pom.xml
+++ b/streampipes-pipeline-elements-all-jvm/pom.xml
@@ -82,6 +82,12 @@
<version>0.65.1-SNAPSHOT</version>
<classifier>embed</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-processors-geo-jvm</artifactId>
+ <version>0.65.1-SNAPSHOT</version>
+ <classifier>embed</classifier>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java b/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
index 90587ff..5468337 100644
--- a/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
+++ b/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
@@ -35,6 +35,12 @@ import org.apache.streampipes.processors.filters.jvm.processor.numericaltextfilt
import org.apache.streampipes.processors.filters.jvm.processor.projection.ProjectionController;
import org.apache.streampipes.processors.filters.jvm.processor.textfilter.TextFilterController;
import org.apache.streampipes.processors.filters.jvm.processor.threshold.ThresholdDetectionController;
+import org.apache.streampipes.processors.geo.jvm.jts.processor.latLngToGeo.LatLngToGeoController;
+import org.apache.streampipes.processors.geo.jvm.jts.processor.setEPSG.SetEpsgController;
+import org.apache.streampipes.processors.geo.jvm.processor.distancecalculator.DistanceCalculatorController;
+import org.apache.streampipes.processors.geo.jvm.processor.geocoder.GoogleMapsGeocodingController;
+import org.apache.streampipes.processors.geo.jvm.processor.revgeocoder.ReverseGeocodingController;
+import org.apache.streampipes.processors.geo.jvm.processor.staticgeocoder.StaticGoogleMapsGeocodingController;
import org.apache.streampipes.processors.imageprocessing.jvm.processor.genericclassification.GenericImageClassificationController;
import org.apache.streampipes.processors.imageprocessing.jvm.processor.imagecropper.ImageCropperController;
import org.apache.streampipes.processors.imageprocessing.jvm.processor.imageenrichment.ImageEnrichmentController;
@@ -117,7 +123,13 @@ public class AllPipelineElementsInit extends StandaloneModelSubmitter {
.add(new OneSignalController())
.add(new SlackNotificationController())
.add(new NumericalTextFilterController())
- .add(new SizeMeasureController());
+ .add(new SizeMeasureController())
+ .add(new DistanceCalculatorController())
+ .add(new GoogleMapsGeocodingController())
+ .add(new StaticGoogleMapsGeocodingController())
+ .add(new ReverseGeocodingController())
+ .add(new SetEpsgController())
+ .add(new LatLngToGeoController());
DeclarersSingleton.getInstance().registerDataFormats(new JsonDataFormatFactory(),
diff --git a/streampipes-processors-geo-jvm/pom.xml b/streampipes-processors-geo-jvm/pom.xml
index 85bb4b9..e789d4d 100644
--- a/streampipes-processors-geo-jvm/pom.xml
+++ b/streampipes-processors-geo-jvm/pom.xml
@@ -92,6 +92,21 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <classifier>embed</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>