#550 update sample data

lixun910 · Jan 27, 2017 · 86364fd · 86364fd
1 parent 5198b1f
commit 86364fd
Show file tree

Hide file tree

Showing 61 changed files with 19 additions and 169 deletions.
diff --git a/...CommonDistFiles/web_plugins/baltimore.png → ...iles/web_plugins/Baltimore Home Sales.png b/...CommonDistFiles/web_plugins/baltimore.png → ...iles/web_plugins/Baltimore Home Sales.png
diff --git a/...ls/CommonDistFiles/web_plugins/boston.png → ...stFiles/web_plugins/Boston Home Sales.png b/...ls/CommonDistFiles/web_plugins/boston.png → ...stFiles/web_plugins/Boston Home Sales.png
diff --git a/...mmonDistFiles/web_plugins/buenosaires.png → ...es/web_plugins/Buenos Aires Elections.png b/...mmonDistFiles/web_plugins/buenosaires.png → ...es/web_plugins/Buenos Aires Elections.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/CharlestonMSA2.png b/BuildTools/CommonDistFiles/web_plugins/CharlestonMSA2.png
diff --git a/.../CommonDistFiles/web_plugins/colmunic.png → ...istFiles/web_plugins/Colombia Malaria.png b/.../CommonDistFiles/web_plugins/colmunic.png → ...istFiles/web_plugins/Colombia Malaria.png
diff --git a/.../CommonDistFiles/web_plugins/columbus.png → ...nDistFiles/web_plugins/Columbus Crime.png b/.../CommonDistFiles/web_plugins/columbus.png → ...nDistFiles/web_plugins/Columbus Crime.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/HickoryMSA2.png b/BuildTools/CommonDistFiles/web_plugins/HickoryMSA2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/LansingMSA2.png b/BuildTools/CommonDistFiles/web_plugins/LansingMSA2.png
diff --git a/...DistFiles/web_plugins/mi_msa_counties.png → ...les/web_plugins/Milwaukee 2000 Census.png b/...DistFiles/web_plugins/mi_msa_counties.png → ...les/web_plugins/Milwaukee 2000 Census.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/MilwaukeeMSA2.png b/BuildTools/CommonDistFiles/web_plugins/MilwaukeeMSA2.png
diff --git a/...Tools/CommonDistFiles/web_plugins/nyc.png → .../CommonDistFiles/web_plugins/NYC Data.png b/...Tools/CommonDistFiles/web_plugins/nyc.png → .../CommonDistFiles/web_plugins/NYC Data.png
diff --git a/...ols/CommonDistFiles/web_plugins/nepal.png → ...CommonDistFiles/web_plugins/Nepal Aid.png b/...ols/CommonDistFiles/web_plugins/nepal.png → ...CommonDistFiles/web_plugins/Nepal Aid.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/OrlandoMSA2.png b/BuildTools/CommonDistFiles/web_plugins/OrlandoMSA2.png
diff --git a/...Tools/CommonDistFiles/web_plugins/phx.png → ...mmonDistFiles/web_plugins/Phoenix ACS.png b/...Tools/CommonDistFiles/web_plugins/phx.png → ...mmonDistFiles/web_plugins/Phoenix ACS.png
diff --git a/...ools/CommonDistFiles/web_plugins/sids.png → ...s/CommonDistFiles/web_plugins/SIDS NC.png b/...ools/CommonDistFiles/web_plugins/sids.png → ...s/CommonDistFiles/web_plugins/SIDS NC.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/SacramentoMSA2.png b/BuildTools/CommonDistFiles/web_plugins/SacramentoMSA2.png
diff --git a/...ommonDistFiles/web_plugins/sfpd_plots.png → ...onDistFiles/web_plugins/SanFran Crime.png b/...ommonDistFiles/web_plugins/sfpd_plots.png → ...onDistFiles/web_plugins/SanFran Crime.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/SavannahMSA2.png b/BuildTools/CommonDistFiles/web_plugins/SavannahMSA2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/SeattleMSA2.png b/BuildTools/CommonDistFiles/web_plugins/SeattleMSA2.png
diff --git a/...ommonDistFiles/web_plugins/natregimes.png → ...monDistFiles/web_plugins/US Homicides.png b/...ommonDistFiles/web_plugins/natregimes.png → ...monDistFiles/web_plugins/US Homicides.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/atl_hom.png b/BuildTools/CommonDistFiles/web_plugins/atl_hom.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/coldept.png b/BuildTools/CommonDistFiles/web_plugins/coldept.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/ga_final_census2.png b/BuildTools/CommonDistFiles/web_plugins/ga_final_census2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/ga_msa_counties.png b/BuildTools/CommonDistFiles/web_plugins/ga_msa_counties.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/grid100.png b/BuildTools/CommonDistFiles/web_plugins/grid100.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/grid100s.png b/BuildTools/CommonDistFiles/web_plugins/grid100s.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/grid77.png b/BuildTools/CommonDistFiles/web_plugins/grid77.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/hou_hom.png b/BuildTools/CommonDistFiles/web_plugins/hou_hom.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/juvenile.png b/BuildTools/CommonDistFiles/web_plugins/juvenile.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/mi_final_census2.png b/BuildTools/CommonDistFiles/web_plugins/mi_final_census2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/nc_final_census2.png b/BuildTools/CommonDistFiles/web_plugins/nc_final_census2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/nc_msa_counties.png b/BuildTools/CommonDistFiles/web_plugins/nc_msa_counties.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/ndvigrid.png b/BuildTools/CommonDistFiles/web_plugins/ndvigrid.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/ohlung.png b/BuildTools/CommonDistFiles/web_plugins/ohlung.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/ohutm.png b/BuildTools/CommonDistFiles/web_plugins/ohutm.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/orlando_counties.png b/BuildTools/CommonDistFiles/web_plugins/orlando_counties.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/orlando_final_census2.png b/BuildTools/CommonDistFiles/web_plugins/orlando_final_census2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/oz96_utm.png b/BuildTools/CommonDistFiles/web_plugins/oz96_utm.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/oz9799.png b/BuildTools/CommonDistFiles/web_plugins/oz9799.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/pitt93.png b/BuildTools/CommonDistFiles/web_plugins/pitt93.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/pitt94.png b/BuildTools/CommonDistFiles/web_plugins/pitt94.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/pitthom.png b/BuildTools/CommonDistFiles/web_plugins/pitthom.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/police.png b/BuildTools/CommonDistFiles/web_plugins/police.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/rosas1999.png b/BuildTools/CommonDistFiles/web_plugins/rosas1999.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/rosas2001.png b/BuildTools/CommonDistFiles/web_plugins/rosas2001.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/sacramentot2.png b/BuildTools/CommonDistFiles/web_plugins/sacramentot2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/samples.sqlite b/BuildTools/CommonDistFiles/web_plugins/samples.sqlite
diff --git a/BuildTools/CommonDistFiles/web_plugins/sc_final_census2.png b/BuildTools/CommonDistFiles/web_plugins/sc_final_census2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/sc_msa_counties.png b/BuildTools/CommonDistFiles/web_plugins/sc_msa_counties.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/scotdistricts.png b/BuildTools/CommonDistFiles/web_plugins/scotdistricts.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/scotlip.png b/BuildTools/CommonDistFiles/web_plugins/scotlip.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/sids2.png b/BuildTools/CommonDistFiles/web_plugins/sids2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/south.png b/BuildTools/CommonDistFiles/web_plugins/south.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/stl_hom.png b/BuildTools/CommonDistFiles/web_plugins/stl_hom.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/tampa_counties.png b/BuildTools/CommonDistFiles/web_plugins/tampa_counties.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/tampa_final_census2.png b/BuildTools/CommonDistFiles/web_plugins/tampa_final_census2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/wa_final_census2.png b/BuildTools/CommonDistFiles/web_plugins/wa_final_census2.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/wa_msa_counties.png b/BuildTools/CommonDistFiles/web_plugins/wa_msa_counties.png
diff --git a/BuildTools/CommonDistFiles/web_plugins/wi_final_census2_random4.png b/BuildTools/CommonDistFiles/web_plugins/wi_final_census2_random4.png
diff --git a/DialogTools/ConnectDatasourceDlg.cpp b/DialogTools/ConnectDatasourceDlg.cpp
@@ -971,7 +971,7 @@ void ConnectDatasourceDlg::InitSamplePanel()
     {
         wxBoxSizer* sizer;
         sizer = new wxBoxSizer( wxVERTICAL );
-        int n = 57;
+        int n = 10;
         for (int i=0; i<n; i++) {
             wxString sample_name = GdaConst::sample_names[i];
             wxString sample_ds_name = GdaConst::sample_datasources[i];

diff --git a/GdaConst.cpp b/GdaConst.cpp
@@ -22,130 +22,31 @@
 #include "GenUtils.h"
 #include <wx/mstream.h>
 
+// 10 local + 29 http
 const char* GdaConst::sample_names[] = {
     "US County Homicides",
     "House Prices Baltimore",
     "House Prices Boston",
-    "Columbus neighborhood crime",
-    "SIDS2: North Carolina county SIDS death counts and rates",
-    "Nepal Aid: Health, poverty and education indicators",
-    "NYC Subborough Data",
+    "Columbus Crime",
+    "NC SIDS",
+    "Nepal Aid",
+    "NYC Data",
     "Malaria Colombia Cities",
-    "Phoenix ACS: Phoenix American Community Survey Data 2010",
-    "San Francisco Crime: July-Dec 2012 crime incidents",
-
-    "Buenosaires: Electoral Data for 1999 Argentinean Elections",
-    "Milwaukee1: WI 2000 Census Tract Data",
-    "Malaria in Colombia: departments-incidence and population",
-    "StLouis: St Louis Region Homicides counts and rates",
-    "Atlanta, GA region homicide counts and rates",
-    "Charleston1: SC MSA 2000 Census Tract Data",
-    "Charleston1: SC counties 2000 Census Tract Data",
-    "Charleston2: 1998 and 2001 Zip Code Business Patterns",
-    "Grid100: Grid with simulated variables",
-    "Hickory1: NC MSA 2000 Census Tract Data for Hickory",
-    "Hickory1: NC counties 2000 Census Tract Data for Hickory",
-    "Hickory2: 1998 and 2001 Zip Code Business Patterns ",
-    "Houston: region homicide counts and rates",
-    "Juvenile: Cardiff juvenile delinquent residences",
-    "Lansing1: MI counties 2000 Census Tract Data",
-    "Lansing1: MI MSA 2000 Census Tract Data",
-    "Lansing2: 1998 and 2001 Zip Code Business Patterns",
-    "Laozone: Ozone measures at monitoring stations in LA basin",
-    "LasRosas1999: Corn yield, fertilizer and field data",
-    "LasRosas2001: Corn yield, fertilizer and field data",
-    "Milwaukee2: 1998 and 2001 Zip Code Business Patterns",
-    "NCOVR: US county homicides 1960-1990",
-    "NDVI: Normalized Difference Vegetation Index grid",
-    "Ohiolung: UTM zone lung cancer data, 1968, 1978, 1988",
-    "Ohiolung: OH counties lung cancer data, 1968, 1978, 1988",
-    "Orlando1: Counties 2000 Census Tract Data",
-    "Orlando1: Final Census 2000 Census Tract Data",
-    "Orlando2: MSA 1998 and 2001 Zip Code Business Patterns",
-    "Oz9799: Monthly ozone data, 1997-99",
-
-    "Pittsburgh: 1993 homicide locations",
-    "Pittsburgh: 1994 homicide locations",
-    "Pittsburgh: 1993 1994 homicide locations",
-    "Police: Police expenditures Mississippi counties",
-    "Sacramento1: 2000 Census Tract Data",
-    "Sacramento2: 1998 and 2001 Zip Code Business Patterns",
-
-    "Savannah1: GA MSA 2000 Census Tract Data for Savannah",
-    "Savannah1: Counties 2000 Census Tract Data for Savannah",
-    "Savannah2: 1998 and 2001 Zip Code Business Patterns",
-    "Scotlip: Scottish districts",
-    "Scotlip: Male lip cancer in Scotland, 1975-80",
-    "Seattle1: WA MSA 2000 Census Tract Data",
-    "Seattle1: WA counties 2000 Census Tract Data",
-    "Seattle2: 1998 and 2001 Zip Code Business Patterns",
-    "SIDS: North Carolina county SIDS death counts",
-    "South: US Southern county homicides 1960-1990",
-    "Tampa1: FL counties 2000 Census Tract Data",
-    "Tampa1: FL MSA 2000 Census Tract Data"
+    "Phoenix ACS",
+    "San Francisco Crime"
 };
 
 const char* GdaConst::sample_layer_names[] = {
-    "natregimes",
-    "baltimore",
-    "boston",
-    "columbus",
-    "sids2",
-    "nepal",
-    "nyc",
-    "colmunic",
-    "phx",
-    "sfpd_plots",
-
-    "buenosaires",
-    "wi_final_census2_random4",
-    "coldept",
-    "stl_hom",
-    "atl_hom",
-    "sc_msa_counties",
-    "sc_final_census2",
-    "CharlestonMSA2",
-    "grid100",
-    "nc_final_census2",
-    "nc_msa_counties",
-    "HickoryMSA2",
-    "hou_hom",
-    "juvenile",
-    "mi_msa_counties",
-    "mi_final_census2",
-    "LansingMSA2",
-    "oz96_utm",
-    "rosas1999",
-    "rosas2001",
-    "MilwaukeeMSA2",
-    "NAT",
-    "ndvigrid",
-    "ohlung",
-    "ohutm",
-    "orlando_counties",
-    "orlando_final_census2",
-    "OrlandoMSA2",
-    "oz9799",
-
-    "pitt93",
-    "pitt94",
-    "pitthom",
-    "police",
-    "sacramentot2",
-    "SacramentoMSA2",
-
-    "ga_final_census2",
-    "ga_msa_counties",
-    "SavannahMSA2",
-    "scotdistricts",
-    "scotlip",
-    "wa_final_census2",
-    "wa_msa_counties",
-    "SeattleMSA2",
-    "sids",
-    "south",
-    "tampa_counties",
-    "tampa_final_census2"
+    "US Homicides",
+    "Baltimore Home Sales",
+    "Boston Home Sales",
+    "Columbus Crime",
+    "SIDS NC",
+    "Nepal Aid",
+    "NYC Data",
+    "Colombia Malaria",
+    "Phoenix ACS",
+    "SanFran Crime"
 };
 
 const char* GdaConst::sample_datasources[] = {
@@ -158,58 +59,7 @@ const char* GdaConst::sample_datasources[] = {
     "samples.sqlite",
     "samples.sqlite",
     "samples.sqlite",
-    "samples.sqlite",
-
-    "http://geodacenter.github.io/sample_data/buenosaires.geojson",
-    "http://geodacenter.github.io/sample_data/wi_final_census2_random4.geojson",
-    "http://geodacenter.github.io/sample_data/coldept.geojson",
-    "http://geodacenter.github.io/sample_data/stl_hom.geojson",
-
-    "http://geodacenter.github.io/sample_data/atl_hom.geojson",
-    "http://geodacenter.github.io/sample_data/sc_msa_counties.geojson",
-    "http://geodacenter.github.io/sample_data/sc_final_census2.geojson",
-    "http://geodacenter.github.io/sample_data/CharlestonMSA2.geojson",
-    "http://geodacenter.github.io/sample_data/grid100.geojson",
-    "http://geodacenter.github.io/sample_data/nc_final_census2.geojson",
-    "http://geodacenter.github.io/sample_data/nc_msa_counties.geojson",
-    "http://geodacenter.github.io/sample_data/HickoryMSA2.geojson",
-    "http://geodacenter.github.io/sample_data/hou_hom.geojson",
-    "http://geodacenter.github.io/sample_data/juvenile.geojson",
-    "http://geodacenter.github.io/sample_data/mi_msa_counties.geojson",
-    "http://geodacenter.github.io/sample_data/mi_final_census2.geojson",
-    "http://geodacenter.github.io/sample_data/LansingMSA2.geojson",
-    "http://geodacenter.github.io/sample_data/oz96_utm.geojson",
-    "http://geodacenter.github.io/sample_data/rosas1999.geojson",
-    "http://geodacenter.github.io/sample_data/rosas2001.geojson",
-    "http://geodacenter.github.io/sample_data/MilwaukeeMSA2.geojson",
-    "http://geodacenter.github.io/sample_data/NAT.geojson",
-    "http://geodacenter.github.io/sample_data/ndvigrid.geojson",
-    "http://geodacenter.github.io/sample_data/ohlung.geojson",
-    "http://geodacenter.github.io/sample_data/ohutm.geojson",
-    "http://geodacenter.github.io/sample_data/orlando_counties.geojson",
-    "http://geodacenter.github.io/sample_data/orlando_final_census2.geojson",
-    "http://geodacenter.github.io/sample_data/OrlandoMSA2.geojson",
-    "http://geodacenter.github.io/sample_data/oz9799.geojson",
-
-    "http://geodacenter.github.io/sample_data/pitt93.geojson",
-    "http://geodacenter.github.io/sample_data/pitt94.geojson",
-    "http://geodacenter.github.io/sample_data/pitthom.geojson",
-    "http://geodacenter.github.io/sample_data/police.geojson",
-    "http://geodacenter.github.io/sample_data/sacramentot2.geojson",
-    "http://geodacenter.github.io/sample_data/SacramentoMSA2.geojson",
-
-    "http://geodacenter.github.io/sample_data/ga_final_census2.geojson",
-    "http://geodacenter.github.io/sample_data/ga_msa_counties.geojson",
-    "http://geodacenter.github.io/sample_data/SavannahMSA2.geojson",
-    "http://geodacenter.github.io/sample_data/scotdistricts.geojson",
-    "http://geodacenter.github.io/sample_data/scotlip.geojson",
-    "http://geodacenter.github.io/sample_data/wa_final_census2.geojson",
-    "http://geodacenter.github.io/sample_data/wa_msa_counties.geojson",
-    "http://geodacenter.github.io/sample_data/SeattleMSA2.geojson",
-    "http://geodacenter.github.io/sample_data/sids.geojson",
-    "http://geodacenter.github.io/sample_data/south.geojson",
-    "http://geodacenter.github.io/sample_data/tampa_counties.geojson",
-    "http://geodacenter.github.io/sample_data/tampa_final_census2.geojson"
+    "samples.sqlite"
 };
 
 const char* GdaConst::raw_zoom_in[] = {