bug fix to load xmls

geolonia · Feb 9, 2023 · 89e73c7 · 89e73c7
1 parent e7aff8d
commit 89e73c7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/src/Home.tsx b/src/Home.tsx
@@ -8,29 +8,26 @@ import Log from './Log'
 import './Home.scss';
 
 interface XMLData {
-  name: string;
-  projection: string;
-  count: number;
-  geojson: GeoJSON.FeatureCollection;
+  id: string;
+  data: any;
   resolve: Function;
 }
 
 const Home = () => {
   const [ map, setMap ] = React.useState()
-  const [ id, setId ] = React.useState<string>('')
   const [ data, setData ] = React.useState<XMLData>()
   const [ geoJSONs, setGeoJSONs ] = React.useState<XMLData[]>([])
 
   React.useEffect(() => {
-    if (id && data) {
-      setGeoJSONs(array => [data, ...array])
-      data.resolve(data.geojson)
+    if (data && data.data) {
+      setGeoJSONs(array => [data.data, ...array])
+      data.resolve(data.data.geojson)
     }
-  }, [id, data])
+  }, [data])
 
   return (
     <div className='main'>
-      <Uploader className="uploader" map={map} dataCallback={setData} setid={setId}></Uploader>
+      <Uploader className="uploader" map={map} dataCallback={setData}></Uploader>
       <Loading className='loading'></Loading>
       <Map className="map" setmap={setMap} />
       <Log className='log' geojsons={geoJSONs} map={map}></Log>

diff --git a/src/Uploader.tsx b/src/Uploader.tsx
@@ -58,7 +58,6 @@ interface Props {
   className: string;
   map: any;
   dataCallback: Function;
-  setid: Function;
 }
 
 const Component = (props: Props) => {
@@ -137,26 +136,27 @@ const Component = (props: Props) => {
           const count =  _geojson.count || 0
           const color = _geojson.color || ''
 
-          props.dataCallback({
-            name: name,
-            filename: filename,
-            projection: projection,
-            count: count,
-            geojson: geojson,
-            color: color,
-            resolve: resolve,
+          await props.dataCallback(() => {
+            return {
+              id: id,
+              data: {
+                name: name,
+                filename: filename,
+                projection: projection,
+                count: count,
+                geojson: geojson,
+                color: color,
+              },
+              resolve: resolve,
+            }
           })
 
-          props.setid(id)
-
           if ('任意座標系' !== projection) {
             if (! props.map.getSource(id)) {
               const simpleStyle = new window.geolonia.simpleStyle(geojson, {id: id}).addTo(props.map)
               simpleStyle.updateData(geojson)
             }
           }
-
-          resolve(geojson)
         }
       }) // end Promise()