Skip to content

Commit 662e481

Browse files
author
Josh Devins
committed
fixed data dir
1 parent 8759831 commit 662e481

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "GIS Shapes Reverse Geocoder"
22

3-
version := "0.1"
3+
version := "0.0.1"
44

55
scalaVersion := "2.9.0-1"
66

sbin/buildData.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
RAW_DIR=target/data/raw
4-
BUILD_DIR=target/data/build
3+
RAW_DIR=data/raw
4+
BUILD_DIR=data/build
55

66
function convertFlickrGeoJSON {
77

sbin/downloadData.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ if [ ! -d "sbin" ]; then
3030
fi
3131

3232
# setup target dir
33-
mkdir -p target/data/raw
34-
cd target/data/raw
33+
mkdir -p data/raw
34+
cd data/raw
3535

3636
# download files only if they are missing
3737
downloadIfFileMissing naturalearth-admin-0.zip http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/10m-admin-0-countries.zip

src/test/java/net/joshdevins/gis/geocoder/ShapefileIndexerTest.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public class ShapefileIndexerTest {
2626
@Test
2727
public void testBasicIndexing() throws Exception {
2828

29-
File shapefile = new File(
30-
"/Users/devins/Downloads/data/flickr_shapes_public_dataset_2.0/flickr_shapes_neighbourhoods.shp");
29+
File shapefile = new File("data/build/flickr-shapes/neighbourhoods.shp");
3130
ShapefileDataStore store = new ShapefileDataStore(shapefile.toURI().toURL());
3231

3332
String name = store.getTypeNames()[0];
@@ -49,8 +48,7 @@ public void testBasicIndexing() throws Exception {
4948
System.out.printf("Index built in: %.2f seconds\n", (new Date().getTime() - start) / (float) 1000);
5049

5150
GeometryFactory geometryFactory = new GeometryFactory();
52-
File output = new File(
53-
"/Users/devins/Downloads/data/flickr_shapes_public_dataset_2.0/flickr_shapes_neighbourhoods.txt");
51+
File output = new File("target/test/output/flickr-shapes/neighbourhoods.txt");
5452
Formatter formatter = new Formatter(output);
5553

5654
start = new Date().getTime();
@@ -83,8 +81,7 @@ public void testBasicIndexing() throws Exception {
8381
@Test
8482
public void testPrintShapefile() throws Exception {
8583

86-
File shapefile = new File(
87-
"/Users/devins/Downloads/data/flickr_shapes_public_dataset_2.0/flickr_shapes_continents.shp");
84+
File shapefile = new File("data/build/flickr-shapes/continents.shp");
8885
ShapefileDataStore store = new ShapefileDataStore(shapefile.toURI().toURL());
8986

9087
String name = store.getTypeNames()[0];

0 commit comments

Comments
 (0)