#6 adjust for 20190323 EC changes CAS**

obrienlabs · Mar 23, 2019 · 7645aaf · 7645aaf
1 parent 76c2a68
commit 7645aaf
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.obrienlabs</groupId>
   <artifactId>radar.root</artifactId>
-  <version>0.0.5-SNAPSHOT</version>
+  <version>0.0.6-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>radar.root</name>

diff --git a/radar.model/.settings/org.eclipse.core.resources.prefs b/radar.model/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/radar.se/.classpath b/radar.se/.classpath
@@ -26,7 +26,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/radar.se/.project b/radar.se/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -25,5 +30,6 @@
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/radar.se/.settings/org.eclipse.core.resources.prefs b/radar.se/.settings/org.eclipse.core.resources.prefs
@@ -2,5 +2,4 @@ eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/radar.se/.settings/org.eclipse.jdt.core.prefs b/radar.se/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,14 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/radar.se/.settings/org.eclipse.wst.common.project.facet.core.xml b/radar.se/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.8"/>
+</faceted-project>
diff --git a/radar.se/pom.xml b/radar.se/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.obrienlabs</groupId>
     <artifactId>radar.root</artifactId>
-    <version>0.0.5-SNAPSHOT</version>
+    <version>0.0.6-SNAPSHOT</version>
   </parent>
   <artifactId>radar.se</artifactId>
   <name>radar.se</name>

diff --git a/radar.se/src/main/java/org/obrienscience/radar/integration/ApplicationService.java b/radar.se/src/main/java/org/obrienscience/radar/integration/ApplicationService.java
@@ -104,7 +104,8 @@ public void setCurrentImage(BufferedImage currentImage) {
     public static final int NUMBER_RADAR_SITES = 31;
     public static final int NUMBER_SAT_SITES = 9;
 	public static final String[] RADAR_SITE_IDENTIFIERS = {
-		"WMN",
+		//"WMN",
+			"CASBV", //18_06
 		"XLA",
 		"WMB",
 		"XAM",
@@ -115,21 +116,25 @@ public void setCurrentImage(BufferedImage currentImage) {
 		"XME", // w nfld
 		"WTP", // e nfld
 		"XNI", // superior		
-		"XTI", // timmins
+		//"XTI", // timmins
+			"CASRF",
 		"WGJ", // sault
 		"WKR",
 		"WSO",
 		"XDR",
 		"WBI",
 		"XWL",
-		"XFW", // brandon
+		//"XFW", // brandon
+			"CASFW",
 		"XBE", // regina
-		"XRA", // saskatoon
+		//"XRA", // saskatoon
+			"CASRA",
 		"XBU", // medicine hat
 		"WHN", // edmonton
 		"XSM", // calgary
 		"WHK", // edmonton
-		"WWW", // grande prarie
+		//"WWW", // grande prarie
+			"CASSR",
 		"XSS", // kelowna
 		"XPG",
 		"WUJ", // vancouver
@@ -212,7 +217,8 @@ public void setCurrentImage(BufferedImage currentImage) {
         18
     };
 
-	public static final String CURRENT_URL_PREFIX = "http://www.weatheroffice.gc.ca/data/radar/temp_image/";
+	//public static final String CURRENT_URL_PREFIX = "http://www.weatheroffice.gc.ca/data/radar/temp_image/";
+	public static final String CURRENT_URL_PREFIX = "https://weather.gc.ca/data/radar/temp_image/";
 	public static final String CURRENT_RADAR_URL_POSTFIX = ".GIF";
 	public static final String CURRENT_SAT_URL_POSTFIX = "_1070_100.jpg";	
     public static final String CURRENT_LIGHTNING_URL_POSTFIX = ".png";   
@@ -232,11 +238,13 @@ public void setCurrentImage(BufferedImage currentImage) {
     // post 20120501 WMN, WBI, XFT, 
     //public static final int[] CURRENT_RADAR_URL_MIDFIX_INDEX = { 0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 };// 20130709 prior
     // 20140102 (wmb=cappi)
-	public static final int[] CURRENT_RADAR_URL_MIDFIX_INDEX = { 0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 };// 20130709 prior
+	//public static final int[] CURRENT_RADAR_URL_MIDFIX_INDEX = { 0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 };// 20130709 prior
 	// 20140112 xss=cappi
 	//public static final int[] CURRENT_RADAR_URL_MIDFIX_INDEX = { 0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,1 };// 20130709 prior
 	// 20150131 PRECIP_SNOW
 	//public static final int[] CURRENT_RADAR_URL_MIDFIX_INDEX = { 0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1 };// 201340102 prior
+	// 20190323 (wmb=cappi)
+	public static final int[] CURRENT_RADAR_URL_MIDFIX_INDEX = { 2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 };// 20130709 prior
 
 	public static final String[] SITE_GPSS = {
 		"",

diff --git a/radar.se/src/main/java/org/obrienscience/radar/integration/BlockingCallable.java b/radar.se/src/main/java/org/obrienscience/radar/integration/BlockingCallable.java
@@ -83,7 +83,7 @@ public T captureImage(String unprocessedImagePath,
 		/** stream to file system */
 		String filenamePath = ResourceManager.getFilename(unprocessedImagePath, site, urlAppend, postfix, subdir);
 		// 2018 historical add GIF
-		filenamePath += ".GIF";
+		//filenamePath += ".GIF";
 		FileOutputStream aFileWriter = new FileOutputStream(filenamePath);
 		System.out.println("_Writing to: " + filenamePath);
 		/** connection based on the aURL */

diff --git a/radar.se/src/main/java/org/obrienscience/radar/integration/LiveRadarService.java b/radar.se/src/main/java/org/obrienscience/radar/integration/LiveRadarService.java
@@ -12,6 +12,12 @@
 import org.obrienscience.radar.model.Site;
 import org.obrienscience.radar.model.Sweep;
 
+/**
+ * 20190322
+ * from http://www.weatheroffice.gc.ca/data/radar/temp_image/WMN/WMN_PRECIP_RAIN_2019_03_23_12_20.GIF
+ * to   https://weather.gc.ca/data/radar/temp_image/XFT/XFT_PRECIP_SNOW_2019_03_23_17_40.GIF
+ */
+
 public class LiveRadarService extends RadarService {
 
 	public LiveRadarService() {

diff --git a/radar.web/.classpath b/radar.web/.classpath
@@ -12,17 +12,17 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/radar.web/.settings/org.eclipse.wst.common.component b/radar.web/.settings/org.eclipse.wst.common.component
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+
     <wb-module deploy-name="radar.web-0.0.5-SNAPSHOT">
+
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+
         <dependent-module archiveName="radar.model-0.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/radar.model/radar.model">
+
             <dependency-type>uses</dependency-type>
+
         </dependent-module>
+
         <property name="context-root" value="radar.web"/>
+
         <property name="java-output-path" value="/radar.web/target/classes"/>
+
     </wb-module>
+
 </project-modules>
diff --git a/radar.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/radar.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,7 +2,7 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.8"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>