Initial v4.0 - migrate back to React

7 files changed, 414 insertions, 0 deletions

diff --git a/src/App.css b/src/App.css
new file mode 100644
index 0000000..1e83715
--- /dev/null
+++ b/src/App.css
@@ -0,0 +1,31 @@
+#map {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 100%;
+}
+
+#datetime {
+  position: absolute;
+  margin: 20px 0px 0px 20px;
+  color: white;
+  font-family: monospace;
+}
+#date {
+  font-size: 1.4em;
+}
+#time {
+  font-size: 1.8em;
+}
+
+
+#slider {
+  position: absolute;
+  bottom: 8vh;
+  width: 30vw;
+  margin-left: 35vw;
+  /* @media only screen and (max-device-width: 812px) {
+    width: 80vw;
+    margin-left: 8vw;
+  } */
+}
diff --git a/src/App.js b/src/App.js
new file mode 100644
index 0000000..39953d7
--- /dev/null
+++ b/src/App.js
@@ -0,0 +1,206 @@
+import React, { Component } from 'react';
+import Slider from 'rc-slider';
+import { DateTime } from 'luxon';
+import axios from 'axios';
+import mapboxgl from 'mapbox-gl';
+
+import './App.css';
+import 'mapbox-gl/dist/mapbox-gl.css';
+import 'rc-slider/assets/index.css';
+
+mapboxgl.accessToken = 'pk.eyJ1IjoieXV2YWRtIiwiYSI6ImNpcnMxbzBuaTAwZWdoa25oczlzZmkwbHcifQ.UHtLngbKm9O8945pJm23Nw';
+
+const IMGS_BASE_URL = 'https://imgs.geshem.space/'
+
+
+class App extends Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      mapLoaded: false,
+      imgs: null,
+      res: 280,
+      slider: 9,
+      lng: 35,
+      lat: 31.9,
+      zoom: 6.3,
+      rasterCoords: {
+        140: [
+          [33.35317413, 33.27232471],
+          [36.32243686, 33.27232471],
+          [36.32243686, 30.72293428],
+          [33.35317413, 30.72293428]
+        ],
+        280: [
+          [31.93095218, 34.5156862],
+          [37.86644267, 34.5156862],
+          [37.86644267, 29.42911589],
+          [31.93095218, 29.42911589]
+        ]
+      },
+    };
+  }
+
+  loadSources() {
+    const { imgs } = this.state;
+    let i = 0;
+    while (i < imgs['140'].length) {
+      this.addRadarSource('140', i, imgs['140'][i])
+      this.addRadarLayer('140', i++)
+    }
+    i = 0;
+    while (i < imgs['280'].length) {
+      this.addRadarSource('280', i, imgs['280'][i])
+      this.addRadarLayer('280', i++)
+    }
+    this.showRadarLayer('280', 9)
+  }
+
+  loadRadarData() {
+    axios({
+      url: IMGS_BASE_URL + 'imgs.json',
+      method: 'get',
+    }).then((res) => {
+      this.setState({
+        imgs: res.data
+      })
+      if (this.state.mapLoaded) {
+        this.loadSources();
+      }
+    }).catch(function(error) {
+      console.log(error)
+    })
+  }
+
+  addRadarSource(res, i, url) {
+    this.map.addSource(`radar-${res}-${i}`, {
+      type: 'image',
+      url: IMGS_BASE_URL + url,
+      coordinates: this.state.rasterCoords[res]
+    })
+  }
+
+  addRadarLayer(res, i) {
+    this.map.addLayer({
+      id: `radar-${res}-${i}`,
+      source: `radar-${res}-${i}`,
+      type: 'raster',
+      paint: {
+        'raster-opacity': 0,
+        'raster-opacity-transition': {
+          'duration': 0
+        }
+      }
+    })
+  }
+
+  showRadarLayer(res, i) {
+    this.map.setPaintProperty(`radar-${res}-${i}`, 'raster-opacity', 0.85);
+  }
+
+  hideRadarLayer(res, i) {
+    this.map.setPaintProperty(`radar-${res}-${i}`, 'raster-opacity', 0);
+  }
+
+  removeRadarLayer(res, i) {
+    this.map.removeLayer(`radar-${res}-${i}`)
+  }
+
+  onChangeSlider(val) {
+    this.hideRadarLayer(this.state.res, this.state.slider);
+    this.setState({ slider: val });
+    this.showRadarLayer(this.state.res, val);
+  }
+
+  initMap() {
+    const { lng, lat, zoom } = this.state;
+
+    this.map = new mapboxgl.Map({
+      container: this.mapContainer,
+      style: 'mapbox://styles/mapbox/dark-v9',
+      maxZoom: 10,
+      minZoom: 5,
+      center: [lng, lat],
+      zoom: zoom,
+      hash: false
+    });
+
+    this.map.on('style.load', () => {
+      this.setState({
+        mapLoaded: true
+      });
+      if (this.state.imgs !== null) {
+        this.loadSources();
+      }
+    });
+
+    this.map.on('zoom', () => {
+      const zoomIn = this.map.getZoom() > 7;
+      const from = zoomIn ? '280' : '140';
+      const to = zoomIn ? '140' : '280';
+      if (to !== this.state.res) {
+        this.hideRadarLayer(from, this.state.slider);
+        this.showRadarLayer(to, this.state.slider);
+        this.setState({ res: to });
+      }
+    });
+  }
+
+  componentDidMount() {
+    this.loadRadarData();
+    this.initMap();
+  }
+
+  getDateTime() {
+    const {imgs, res, slider} = this.state;
+
+    if (imgs === null) {
+      return null;
+    }
+
+    const ds = imgs[res][slider].substr(5, 13);
+    return DateTime.fromFormat(ds, 'yyyyMMdd/HHmm', {zone: 'utc'}).setZone('Asia/Jerusalem');
+  }
+
+  render() {
+    const handleStyle = {
+      height: 40,
+      width: 40,
+      border: 0,
+      marginTop: -10,
+      marginLeft: -20,
+      boxShadow: '.5px .5px 2px 1px rgba(0,0,0,.32)'
+    }
+
+    const railStyle = {
+      height: 20,
+      backgroundColor: '#3498db'
+    }
+
+    const trackStyle={
+      display: 'none'
+    }
+
+    const datetime = this.getDateTime();
+    console.log(datetime);
+    const date = datetime ? datetime.toFormat('y-MM-dd') : '';
+    const time = datetime ? datetime.toFormat('HH:mm') : '';
+
+    return (
+      <div id="geshem">
+        <div id="map" ref={el => this.mapContainer = el} className="absolute top right left bottom" />
+        <div id="datetime">
+          <div id="date">{ date }</div>
+          <div id="time">{ time }</div>
+        </div>
+        <div id="slider">
+          <Slider mix={0} max={9} defaultValue={this.state.slider} handleStyle={handleStyle}
+            railStyle={railStyle} trackStyle={trackStyle} onChange={(val) => this.onChangeSlider(val)}/>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default App;
diff --git a/src/App.test.js b/src/App.test.js
new file mode 100644
index 0000000..a754b20
--- /dev/null
+++ b/src/App.test.js
@@ -0,0 +1,9 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
+
+it('renders without crashing', () => {
+  const div = document.createElement('div');
+  ReactDOM.render(<App />, div);
+  ReactDOM.unmountComponentAtNode(div);
+});
diff --git a/src/index.css b/src/index.css
new file mode 100644
index 0000000..cee5f34
--- /dev/null
+++ b/src/index.css
@@ -0,0 +1,14 @@
+body {
+  margin: 0;
+  padding: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
+    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
+    monospace;
+}
diff --git a/src/index.js b/src/index.js
new file mode 100644
index 0000000..0c5e75d
--- /dev/null
+++ b/src/index.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+import App from './App';
+import * as serviceWorker from './serviceWorker';
+
+ReactDOM.render(<App />, document.getElementById('root'));
+
+// If you want your app to work offline and load faster, you can change
+// unregister() to register() below. Note this comes with some pitfalls.
+// Learn more about service workers: http://bit.ly/CRA-PWA
+serviceWorker.unregister();
diff --git a/src/logo.svg b/src/logo.svg
new file mode 100644
index 0000000..6b60c10
--- /dev/null
+++ b/src/logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+    <g fill="#61DAFB">
+        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+        <circle cx="420.9" cy="296.5" r="45.7"/>
+        <path d="M520.5 78.1z"/>
+    </g>
+</svg>
diff --git a/src/serviceWorker.js b/src/serviceWorker.js
new file mode 100644
index 0000000..2283ff9
--- /dev/null
+++ b/src/serviceWorker.js
@@ -0,0 +1,135 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// resources are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read http://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.1/8 is considered localhost for IPv4.
+    window.location.hostname.match(
+      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+    )
+);
+
+export function register(config) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (isLocalhost) {
+        // This is running on localhost. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // Add some additional logging to localhost, pointing developers to the
+        // service worker/PWA documentation.
+        navigator.serviceWorker.ready.then(() => {
+          console.log(
+            'This web app is being served cache-first by a service ' +
+              'worker. To learn more, visit http://bit.ly/CRA-PWA'
+          );
+        });
+      } else {
+        // Is not localhost. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl, config) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then(registration => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        if (installingWorker == null) {
+          return;
+        }
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the updated precached content has been fetched,
+              // but the previous service worker will still serve the older
+              // content until all client tabs are closed.
+              console.log(
+                'New content is available and will be used when all ' +
+                  'tabs for this page are closed. See http://bit.ly/CRA-PWA.'
+              );
+
+              // Execute callback
+              if (config && config.onUpdate) {
+                config.onUpdate(registration);
+              }
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              console.log('Content is cached for offline use.');
+
+              // Execute callback
+              if (config && config.onSuccess) {
+                config.onSuccess(registration);
+              }
+            }
+          }
+        };
+      };
+    })
+    .catch(error => {
+      console.error('Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl, config) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl)
+    .then(response => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      const contentType = response.headers.get('content-type');
+      if (
+        response.status === 404 ||
+        (contentType != null && contentType.indexOf('javascript') === -1)
+      ) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then(registration => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl, config);
+      }
+    })
+    .catch(() => {
+      console.log(
+        'No internet connection found. App is running in offline mode.'
+      );
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready.then(registration => {
+      registration.unregister();
+    });
+  }
+}