Skip to content

Commit

Permalink
Line texture: JTS PathLayer support, #105
Browse files Browse the repository at this point in the history
  • Loading branch information
@devemux86
devemux86 committed Aug 7, 2016
1 parent de74719 commit b32b5ce
Show file tree
Hide file tree
Showing 7 changed files with 236 additions and 240 deletions.
113 changes: 51 additions & 62 deletions vtm-android-example/src/org/oscim/android/test/LineTexActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
package org.oscim.android.test;

import android.os.Bundle;
import android.os.SystemClock;

import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Color;
import org.oscim.core.GeoPoint;
import org.oscim.layers.PathLayer;
import org.oscim.core.MapPosition;
import org.oscim.event.Event;
import org.oscim.layers.vector.PathLayer;
import org.oscim.layers.vector.geometries.Style;
import org.oscim.map.Map;
import org.oscim.renderer.bucket.TextureItem;
import org.oscim.theme.styles.LineStyle;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -38,23 +39,52 @@
*/
public class LineTexActivity extends BitmapTileMapActivity {

private static final boolean ANIMATION = false;

private List<PathLayer> mPathLayers = new ArrayList<>();

public LineTexActivity() {
super(STAMEN_TONER.build());
}

TextureItem tex;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mBitmapLayer.tileRenderer().setBitmapAlpha(0.5f);

tex = new TextureItem(CanvasAdapter.getBitmapAsset("", "patterns/pike.png"));
TextureItem tex = new TextureItem(CanvasAdapter.getBitmapAsset("", "patterns/pike.png"));
tex.mipmap = true;

createLayers(1, true);
for (double lat = -90; lat <= 90; lat += 5) {
int c = Color.fade(Color.rainbow((float) (lat + 90) / 180), 0.5f);
Style style = Style.builder()
.stippleColor(c)
.stipple(24)
.stippleWidth(1)
.strokeWidth(12)
.strokeColor(c)
.fixed(true)
.texture(tex)
.build();
PathLayer pathLayer = new PathLayer(mMap, style);
mMap.layers().add(pathLayer);
mPathLayers.add(pathLayer);
}

//looooop();
if (ANIMATION)
mMap.events.bind(new Map.UpdateListener() {
@Override
public void onMapEvent(Event e, MapPosition mapPosition) {
//if (e == Map.UPDATE_EVENT) {
long t = System.currentTimeMillis();
float pos = t % 20000 / 10000f - 1f;
createLayers(pos);
mMap.updateMap(true);
//}
}
});
else
createLayers(1);
}

@Override
Expand All @@ -65,40 +95,16 @@ protected void onResume() {
mMap.setMapPosition(0, 0, 1 << 2);
}

void looooop() {
mMap.postDelayed(new Runnable() {
@Override
public void run() {
long t = SystemClock.uptimeMillis();
float pos = t % 20000 / 10000f - 1f;
createLayers(pos, false);
//Samples.log.debug("update took" + (SystemClock.uptimeMillis() - t) + " " + pos);
looooop();
redraw();
}
}, 50);
}

void redraw() {
mMap.render();
}

ArrayList<PathLayer> mPathLayers = new ArrayList<>();

void createLayers(float pos, boolean init) {
void createLayers(float pos) {

int i = 0;

for (double lat = -90; lat <= 90; lat += 5) {
List<GeoPoint> pts = new ArrayList<>();

double[] packedCoordinates = new double[360 + 2];
//List<GeoPoint> pts = new ArrayList<>();
int c = 0;
for (double lon = -180; lon <= 180; lon += 2) {
//pts.add(new GeoPoint(lat, lon));
double longitude = lon + (pos * 180);
if (longitude < -180)
longitude += 360;
if (longitude > 180)
longitude -= 360;
double longitude = lon;

double latitude = lat + (pos * 90);
if (latitude < -90)
Expand All @@ -108,32 +114,15 @@ void createLayers(float pos, boolean init) {

latitude += Math.sin((Math.abs(pos) * (lon / Math.PI)));

pts.add(new GeoPoint(latitude, longitude));
}
PathLayer pathLayer;
if (init) {
int c = Color.fade(Color.rainbow((float) (lat + 90) / 180), 0.9f);

LineStyle style = LineStyle.builder()
.stippleColor(c)
.stipple(24)
.stippleWidth(1)
.strokeWidth(12)
.strokeColor(c)
.fixed(true)
.texture(tex)
.build();

pathLayer = new PathLayer(mMap, style);

mMap.layers().add(pathLayer);
mPathLayers.add(pathLayer);
} else {
pathLayer = mPathLayers.get(i++);
packedCoordinates[c++] = longitude;
packedCoordinates[c++] = latitude;
}

pathLayer.setPoints(pts);
}
//LineString line = new LineString(factory.create(packedCoordinates, 2), geomFactory);
//mPathLayers.get(i++).setLineString(line);

mPathLayers.get(i++).setLineString(packedCoordinates);

}
}
}
23 changes: 17 additions & 6 deletions vtm-android-example/src/org/oscim/android/test/VectorLayerMapActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@
import org.oscim.layers.vector.VectorLayer;
import org.oscim.layers.vector.geometries.PointDrawable;
import org.oscim.layers.vector.geometries.Style;
import org.oscim.theme.VtmThemes;
import org.oscim.utils.ColorUtil;

public class VectorLayerMapActivity extends BaseMapActivity {
import static org.oscim.tiling.source.bitmap.DefaultSources.STAMEN_TONER;

public class VectorLayerMapActivity extends BitmapTileMapActivity {

public VectorLayerMapActivity() {
super(STAMEN_TONER.build());
}

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

mMap.setTheme(VtmThemes.DEFAULT);
mBitmapLayer.tileRenderer().setBitmapAlpha(0.5f);

VectorLayer vectorLayer = new VectorLayer(mMap);

Expand Down Expand Up @@ -74,24 +78,31 @@ public void onCreate(Bundle savedInstanceState) {
Style.Builder sb = Style.builder()
.buffer(0.5)
.fillColor(Color.RED)
.fillAlpha(0.2);
.fillAlpha(0.2f);

for (int i = 0; i < 2000; i++) {
Style style = sb.buffer(Math.random() + 0.2)
.fillColor(ColorUtil.setHue(Color.RED,
(int) (Math.random() * 50) / 50.0))
.fillAlpha(0.5)
.fillAlpha(0.5f)
.build();

vectorLayer.add(new PointDrawable(Math.random() * 180 - 90,
Math.random() * 360 - 180,
style));

}
vectorLayer.update();

mMap.layers().add(vectorLayer);
mMap.layers().add(new TileGridLayer(mMap, 0xff222222, 1.2f, 1));
}

@Override
protected void onResume() {
super.onResume();

/* ignore saved position */
mMap.setMapPosition(0, 0, 1 << 2);
}
}
5 changes: 2 additions & 3 deletions vtm-jts/src/org/oscim/layers/vector/PathLayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.List;

/**
* This class draws a path line in given color.
* This class draws a path line in given color or texture.
*/
public class PathLayer extends VectorLayer {

Expand Down Expand Up @@ -136,8 +136,7 @@ public void addGreatCircle(GeoPoint startPoint, GeoPoint endPoint) {
public void addGreatCircle(GeoPoint startPoint, GeoPoint endPoint,
final int numberOfPoints) {
/* adapted from page
* http://compastic.blogspot.co.uk/2011/07/how-to-draw-great-circle-on-map
* -in.html
* http://compastic.blogspot.co.uk/2011/07/how-to-draw-great-circle-on-map-in.html
* which was adapted from page http://maps.forum.nu/gm_flight_path.html */

GeomBuilder gb = new GeomBuilder();
Expand Down
37 changes: 35 additions & 2 deletions vtm-jts/src/org/oscim/layers/vector/VectorLayer.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2016 devemux86
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.layers.vector;

import com.vividsolutions.jts.geom.Envelope;
Expand Down Expand Up @@ -234,9 +250,26 @@ protected void drawPoint(Task t, int level, Geometry points, Style style) {

protected void drawLine(Task t, int level, Geometry line, Style style) {

LineBucket ll = t.buckets.getLineBucket(level);
LineBucket ll;
if (style.stipple == 0 && style.texture == null)
ll = t.buckets.getLineBucket(level);
else
ll = t.buckets.getLineTexBucket(level);
if (ll.line == null) {
ll.line = new LineStyle(0, style.strokeColor, style.strokeWidth);
if (style.stipple == 0 && style.texture == null)
ll.line = new LineStyle(style.strokeColor, style.strokeWidth, style.cap);
else
ll.line = LineStyle.builder()
.cap(style.cap)
.color(style.strokeColor)
.fixed(style.fixed)
.level(0)
.stipple(style.stipple)
.stippleColor(style.stippleColor)
.stippleWidth(style.stippleWidth)
.strokeWidth(style.strokeWidth)
.texture(style.texture)
.build();
}

if (style.generalization != Style.GENERALIZATION_NONE) {
Expand Down
Loading

0 comments on commit b32b5ce

Please sign in to comment.