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

Fix vtm-jeo #770

Closed
wants to merge 10 commits into from
Closed

Fix vtm-jeo #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d76b4a8
Updated jeo dependency to jitpack
ironjan Apr 13, 2020
3ceff29
Added osgeo repository
ironjan Apr 13, 2020
2da69f2
Renamed all imports from org.jeo to io.jeo
ironjan Apr 13, 2020
7bf59b3
Renamed MemVector to MemVectorDataset
ironjan Apr 13, 2020
f32e750
Renamed cursor to read
ironjan Apr 13, 2020
4cbfcd1
MemWorkspace now always requires a name parameter in constructor
ironjan Apr 13, 2020
a71116c
Re-Added BasicFeature to keep changes at a minimum
ironjan Apr 13, 2020
1dae0de
Adapted to API changes
ironjan Apr 13, 2020
544e255
Re-Enabled vtm-jeo
ironjan Apr 13, 2020
da2c6e7
Removed incorrect dependency
ironjan Apr 20, 2020
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def versionName() { return version }
subprojects {
repositories {
google()
//maven { url 'https://repo.boundlessgeo.com/main/' }
maven { url 'https://repo.osgeo.org/repository/release/' }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That doesn't seem to be needed anywhere now.

jcenter()
maven { url 'https://jitpack.io' }
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ include ':vtm-gdx-poi3d'
include ':vtm-http'
include ':vtm-ios'
include ':vtm-ios-example'
//include ':vtm-jeo'
include ':vtm-jeo'
include ':vtm-json'
include ':vtm-jts'
include ':vtm-models'
Expand Down
6 changes: 2 additions & 4 deletions vtm-jeo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ apply plugin: 'maven'

dependencies {
api project(':vtm')
api('org.jeo:jeo:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
api('org.jeo:jeo-carto:0-SNAPSHOT') {

api('com.github.jeo.jeo:jeo-carto:master-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
}
Expand Down
2 changes: 1 addition & 1 deletion vtm-jeo/src/org/oscim/jeo/JeoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.oscim.jeo;

import org.jeo.map.RGB;
import io.jeo.map.RGB;

public class JeoUtils {
public static int color(RGB rgb) {
Expand Down
5 changes: 3 additions & 2 deletions vtm-jeo/src/org/oscim/layers/JeoTileSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*/
package org.oscim.layers;

import org.jeo.tile.Tile;
import org.jeo.tile.TileDataset;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.layers.tile.MapTile;
Expand All @@ -30,6 +28,9 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;

import io.jeo.tile.Tile;
import io.jeo.tile.TileDataset;

import static org.oscim.tiling.QueryResult.FAILED;
import static org.oscim.tiling.QueryResult.SUCCESS;
import static org.oscim.tiling.QueryResult.TILE_NOT_FOUND;
Expand Down
21 changes: 11 additions & 10 deletions vtm-jeo/src/org/oscim/layers/JeoVectorLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;

import org.jeo.geom.Geom;
import org.jeo.map.CartoCSS;
import org.jeo.map.RGB;
import org.jeo.map.Rule;
import org.jeo.map.RuleList;
import org.jeo.map.Style;
import org.jeo.vector.Feature;
import org.jeo.vector.VectorDataset;
import org.jeo.vector.VectorQuery;
import org.oscim.jeo.JeoUtils;
import org.oscim.map.Map;
import org.oscim.renderer.bucket.LineBucket;
Expand All @@ -40,6 +31,16 @@

import java.io.IOException;

import io.jeo.geom.Geom;
import io.jeo.map.CartoCSS;
import io.jeo.map.RGB;
import io.jeo.map.Rule;
import io.jeo.map.RuleList;
import io.jeo.map.Style;
import io.jeo.vector.Feature;
import io.jeo.vector.VectorDataset;
import io.jeo.vector.VectorQuery;

public class JeoVectorLayer extends JtsLayer {

public static final Logger log = LoggerFactory.getLogger(JeoVectorLayer.class);
Expand Down Expand Up @@ -77,7 +78,7 @@ protected void processFeatures(Task t, Envelope b) {
VectorQuery q = new VectorQuery().bounds(b);
if (dbg)
log.debug("query {}", b);
for (Feature f : mDataset.cursor(q)) {
for (Feature f : mDataset.read(q)) {
if (dbg)
log.debug("feature {}", f);

Expand Down
3 changes: 2 additions & 1 deletion vtm-jeo/src/org/oscim/layers/JtsLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.geom.Geometry;

import org.jeo.geom.CoordinatePath;
import org.oscim.core.Box;
import org.oscim.core.GeometryBuffer;
import org.oscim.core.MapPosition;
Expand All @@ -35,6 +34,8 @@
import org.oscim.utils.geom.SimplifyDP;
import org.oscim.utils.geom.SimplifyVW;

import io.jeo.geom.CoordinatePath;

public abstract class JtsLayer extends AbstractVectorLayer<Geometry> {

private double mMinX;
Expand Down
13 changes: 7 additions & 6 deletions vtm-jeo/src/org/oscim/layers/OSMIndoorLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;

import org.jeo.map.CartoCSS;
import org.jeo.map.RGB;
import org.jeo.map.Rule;
import org.jeo.map.Style;
import org.jeo.vector.Feature;
import org.jeo.vector.VectorDataset;
import org.oscim.backend.canvas.Color;
import org.oscim.jeo.JeoUtils;
import org.oscim.map.Map;
Expand All @@ -41,6 +35,13 @@

import java.util.HashMap;

import io.jeo.map.CartoCSS;
import io.jeo.map.RGB;
import io.jeo.map.Rule;
import io.jeo.map.Style;
import io.jeo.vector.Feature;
import io.jeo.vector.VectorDataset;

public class OSMIndoorLayer extends JeoVectorLayer {

protected TextBucket mTextLayer;
Expand Down
51 changes: 27 additions & 24 deletions vtm-jeo/src/org/oscim/test/JeoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,6 @@

import com.vividsolutions.jts.geom.Geometry;

import org.jeo.carto.Carto;
import org.jeo.data.Dataset;
import org.jeo.data.mem.MemVector;
import org.jeo.data.mem.MemWorkspace;
import org.jeo.geojson.GeoJSONDataset;
import org.jeo.geojson.GeoJSONReader;
import org.jeo.geom.GeomBuilder;
import org.jeo.map.Style;
import org.jeo.vector.Feature;
import org.jeo.vector.Features;
import org.jeo.vector.Schema;
import org.jeo.vector.SchemaBuilder;
import org.jeo.vector.VectorDataset;
import org.jeo.vector.VectorQuery;
import org.oscim.backend.canvas.Color;
import org.oscim.layers.OSMIndoorLayer;
import org.oscim.layers.tile.buildings.BuildingLayer;
Expand All @@ -48,6 +34,22 @@
import java.io.IOException;
import java.io.InputStream;

import io.jeo.carto.Carto;
import io.jeo.data.Dataset;
import io.jeo.data.mem.MemVectorDataset;
import io.jeo.data.mem.MemWorkspace;
import io.jeo.geojson.GeoJSONDataset;
import io.jeo.geojson.GeoJSONReader;
import io.jeo.geom.GeomBuilder;
import io.jeo.map.Style;
import io.jeo.vector.Feature;
import io.jeo.vector.Features;
import io.jeo.vector.ListFeature;
import io.jeo.vector.Schema;
import io.jeo.vector.SchemaBuilder;
import io.jeo.vector.VectorDataset;
import io.jeo.vector.VectorQuery;

public class JeoTest {

public static void indoorSketch(Map map, String file) {
Expand Down Expand Up @@ -101,13 +103,13 @@ public static VectorDataset readGeoJson(InputStream is) {
GeoJSONReader r = new GeoJSONReader();

@SuppressWarnings("resource")
MemWorkspace mem = new MemWorkspace();
MemWorkspace mem = new MemWorkspace("");

//mem.put("layer", data);
try {
Schema s = new SchemaBuilder("way").schema();

MemVector memData = mem.create(s);
MemVectorDataset memData = mem.create(s);

for (Feature f : r.features(is)) {
//System.out.println("loaded: " + f);
Expand All @@ -133,17 +135,17 @@ public static Dataset getJsonData(String file, boolean memory) {

if (memory) {
@SuppressWarnings("resource")
MemWorkspace mem = new MemWorkspace();
MemWorkspace mem = new MemWorkspace("");

//mem.put("layer", data);
try {

Schema s = data.schema();
VectorQuery q = new VectorQuery();

MemVector memData = mem.create(s);
MemVectorDataset memData = mem.create(s);

for (Feature f : data.cursor(q)) {
for (Feature f : data.read(q)) {
memData.add(f);
}

Expand All @@ -160,14 +162,14 @@ public static Dataset getMemWorkspace(String layer) {
GeomBuilder gb = new GeomBuilder(4326);

@SuppressWarnings("resource")
MemWorkspace mem = new MemWorkspace();
MemWorkspace mem = new MemWorkspace("");
Schema schema = new SchemaBuilder(layer)
.field("geometry", Geometry.class)
.field("id", Integer.class)
.field("name", String.class)
.field("cost", Double.class).schema();

MemVector data;
MemVectorDataset data;
try {
data = mem.create(schema);
} catch (UnsupportedOperationException e) {
Expand All @@ -181,15 +183,16 @@ public static Dataset getMemWorkspace(String layer) {
Geometry g = gb.point(0, 0).toPoint();
//g.setSRID(4326);

data.add(Features.create(null, data.schema(),

data.add(new ListFeature(data.schema(),
g, 1, "anvil",
10.99));

data.add(Features.create(null, data.schema(),
data.add(new ListFeature(data.schema(),
gb.points(10, 10, 20, 20).toLineString(),
2, "bomb", 11.99));

data.add(Features.create(null, data.schema(),
data.add(new ListFeature(data.schema(),
gb.point(100, 10).toPoint().buffer(10),
3, "dynamite", 12.99));

Expand Down
Loading