From 7645aaf722a6b966d8f4e346d08f53e6c6b67245 Mon Sep 17 00:00:00 2001 From: Michael O'Brien Date: Sat, 23 Mar 2019 14:39:40 -0400 Subject: [PATCH] #6 adjust for 20190323 EC changes CAS** --- pom.xml | 2 +- .../org.eclipse.core.resources.prefs | 3 --- radar.se/.classpath | 2 +- radar.se/.project | 6 +++++ .../org.eclipse.core.resources.prefs | 1 - radar.se/.settings/org.eclipse.jdt.core.prefs | 8 +++++++ ....eclipse.wst.common.project.facet.core.xml | 4 ++++ radar.se/pom.xml | 2 +- .../radar/integration/ApplicationService.java | 22 +++++++++++++------ .../radar/integration/BlockingCallable.java | 2 +- .../radar/integration/LiveRadarService.java | 6 +++++ radar.web/.classpath | 10 ++++----- .../org.eclipse.wst.common.component | 12 ++++++++++ ....eclipse.wst.common.project.facet.core.xml | 2 +- 14 files changed, 61 insertions(+), 21 deletions(-) create mode 100644 radar.se/.settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/pom.xml b/pom.xml index 64d5375..8561e44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.obrienlabs radar.root - 0.0.5-SNAPSHOT + 0.0.6-SNAPSHOT pom radar.root diff --git a/radar.model/.settings/org.eclipse.core.resources.prefs b/radar.model/.settings/org.eclipse.core.resources.prefs index 29abf99..e9441bb 100644 --- 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/=UTF-8 diff --git a/radar.se/.classpath b/radar.se/.classpath index 5b3d2ba..c612c90 100644 --- a/radar.se/.classpath +++ b/radar.se/.classpath @@ -26,7 +26,7 @@ - + diff --git a/radar.se/.project b/radar.se/.project index f4d26d8..5437205 100644 --- a/radar.se/.project +++ b/radar.se/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -25,5 +30,6 @@ org.springframework.ide.eclipse.core.springnature org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature diff --git a/radar.se/.settings/org.eclipse.core.resources.prefs b/radar.se/.settings/org.eclipse.core.resources.prefs index 29abf99..839d647 100644 --- 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/=UTF-8 diff --git a/radar.se/.settings/org.eclipse.jdt.core.prefs b/radar.se/.settings/org.eclipse.jdt.core.prefs index b8947ec..91ca62e 100644 --- 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 new file mode 100644 index 0000000..f4ef8aa --- /dev/null +++ b/radar.se/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,4 @@ + + + + diff --git a/radar.se/pom.xml b/radar.se/pom.xml index 0581454..38f8cac 100644 --- a/radar.se/pom.xml +++ b/radar.se/pom.xml @@ -3,7 +3,7 @@ org.obrienlabs radar.root - 0.0.5-SNAPSHOT + 0.0.6-SNAPSHOT radar.se radar.se 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 index d9fecb3..cbb6a09 100755 --- 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 index 027215a..2061117 100644 --- 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 index 381e3f0..7b304bb 100755 --- 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 index 5e80430..e7ac75e 100644 --- a/radar.web/.classpath +++ b/radar.web/.classpath @@ -12,11 +12,6 @@ - - - - - @@ -24,5 +19,10 @@ + + + + + diff --git a/radar.web/.settings/org.eclipse.wst.common.component b/radar.web/.settings/org.eclipse.wst.common.component index 32c8857..6ccbb0c 100644 --- a/radar.web/.settings/org.eclipse.wst.common.component +++ b/radar.web/.settings/org.eclipse.wst.common.component @@ -1,12 +1,24 @@ + + + + + + + uses + + + + + 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 index 7ba9960..0b77f9b 100644 --- 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 @@ - +