updates

arnoudbuzing · Oct 26, 2018 · ec41f3c · ec41f3c
1 parent 9f1bce9
commit ec41f3c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/Prototypes/PacletInfo.m b/Prototypes/PacletInfo.m
@@ -3,7 +3,7 @@
   Description -> "A paclet for prototype functions",
   Creator -> "Arnoud Buzing",
   Publisher -> "Wolfram Research",
-  Version -> "0.4.6",
+  Version -> "0.4.7",
   MathematicaVersion -> "11.2+",
   Loading -> "Startup",
   Thumbnail -> "icons/icon.png",
@@ -71,7 +71,7 @@
 "Prototypes`$LocalAppDataDirectory",
 "Prototypes`$LocalResourceObjects",
 "Prototypes`$RoamingAppDataDirectory",
-"Prototypes`$UUIDStringPattern",
+"Prototypes`$UUIDStringPattern","Prototypes`GeoContourMap",
 "Prototypes`RandomRomanNumeral", "Prototypes`Deconstruct", "Prototypes`RandomDelete",
 "Prototypes`RandomPosition", "Prototypes`What3Words", "Prototypes`$HashTypes",
 "Prototypes`PrimeCount", "Prototypes`PrimeSum", "Prototypes`$EnglishWords", "Prototypes`OpenSky"}

diff --git a/Prototypes/Source/GeoGraphics.wl b/Prototypes/Source/GeoGraphics.wl
@@ -89,4 +89,25 @@ GeoService = <|
   {"ArcGIS","UnitedStatesTopographical"} -> "https://server.arcgisonline.com/ArcGIS/rest/services/USA_Topo_Maps/MapServer/tile/`1`/`3`/`2`"
   |>;
 
-  GeoService["Properties"] = Keys[GeoService];
+GeoService["Properties"] = Keys[GeoService];
+
+
+
+GeoContourMap[input_, contours_List] := Module[{geobounds, reliefmap, projection, geogridrange, 
+   geoelevationdata, contour},
+  geobounds = GeoBounds[input];
+  reliefmap =
+   GeoGraphics[input, GeoBackground -> "ReliefMap", ImageSize -> 800,
+    Frame -> True];
+  projection = GeoProjection /. Options[reliefmap, GeoProjection];
+  geogridrange = GeoGridRange /. Options[reliefmap, GeoGridRange];
+  geoelevationdata =
+   GeoElevationData[GeoProjection -> projection,
+    GeoGridRange -> geogridrange, UnitSystem -> "Imperial"];
+  contour =
+   ListContourPlot[Reverse[geoelevationdata["Magnitudes"]],
+    Contours -> contours, PlotLegends -> Automatic, ImageSize -> 800,
+    ContourShading -> None, DataRange -> geogridrange,
+    AspectRatio -> Automatic, Frame -> True, PlotRangePadding -> None];
+  Show[First[reliefmap], contour]
+  ]
diff --git a/Prototypes/Source/Script.wl b/Prototypes/Source/Script.wl
@@ -7,4 +7,4 @@ $ScriptExecutionEnvironment := Module[{checks},
   {False,False,True,False}, "Running in wolframscript.exe",
   {False,False,False,False}, "Running directly from .wls"
  ]
-]
+] 
diff --git a/Prototypes/Source/Usage.wl b/Prototypes/Source/Usage.wl
@@ -108,6 +108,8 @@ TranslationCell::usage = "TranslationCell[text,lang] prints a \"Text\" cell cont
 GeoService::usage = "GeoService[name] provides GeoServer 'name' for geographical functions. Use GeoService[\"Properties\"] for a list. Use with GeoServer option.";
 LayeredGeoGraphics::usage = "LayeredGeoGraphics[primitives,layers] creates a layered GeoGraphics map for the specified GeoService layers";
 FormatDetect::usage = "FormatDetect[format,data] checks if 'data' (String/List/ByteArray) matches 'format' (PNG/JPG/GIF)";
+GeoContourMap::usage = "GeoContourMap[location,contours] draws a contour map over a relief map for 'location' using a list of 'contours'";
+
 (* cloud *)
 CreateNotebookRenderAPI::usage = "CreateNotebookRenderAPI[] creates the cloud api functions used by RenderOnlineNotebook";
 RenderOnlineNotebook::usage = "RenderOnlineNotebook[url] reads 'url' and opens a private editable copy";
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ $ScriptExecutionEnvironment := Module[{checks}, @@
       {False,False,True,False}, "Running in wolframscript.exe",
       {False,False,False,False}, "Running directly from .wls"
      ]
-    ]
+    ]