Reworked polygon checking and overlap to use a subdivided grid for li…

…near time

Cargo.toml

@@ -13,6 +13,7 @@ strip = true
 members = [
   "workspaces/circular-sequence",
   "workspaces/line-segment-extending",
+  "workspaces/spatial-grid-map",
   "workspaces/tilings/src-rust/*",
   "workspaces/wasm",
 ]
@@ -29,10 +30,12 @@ futures-util = "0.3.27"
 insta = { version = "1.40.0", features = ["json"] }
 log = "0.4.22"
 pretty_assertions = "1.3.0"
+rand = "0.8.4"
 serde = { version = "1.0.210", features = ["derive"] }
+serde_arrays = "0.1.0"
 serde_json = "1.0.128"
 serde-wasm-bindgen = "0.6.5"
-serde_with = "3.9.0"
+serde_with = "3.11.0"
 sqlx = { version = "0.8.2", features = [
   "chrono",
   "macros",

package.json

@@ -54,6 +54,6 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "preshape": "^19.1.0"
+    "preshape": "^19.1.5"
   }
 }

tsconfig.json

@@ -22,6 +22,6 @@
     "noFallthroughCasesInSwitch": true,
 
     /* Experimental */
-    "types": ["vite/client"]
+    "types": []
   }
 }

workspaces/circle-art/package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "@hogg/circle-intersections": "workspace:^",
     "@hogg/common": "workspace:^",
-    "preshape": "^19.1.0",
+    "preshape": "^19.1.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

workspaces/circle-art/src/Presentation/index.tsx

@@ -16,7 +16,6 @@ const Presentation = ({
     <EditorProvider data={data} onChange={onChange}>
       <ProjectWindow
         controls={<EditorControls />}
-        controlsPosition="top"
         padding="x0"
         tabs={
           <ProjectTabs>

workspaces/circle-intersections/package.json

@@ -15,20 +15,20 @@
     "bitset": "^5.1.1",
     "classnames": "^2.3.2",
     "file-saver": "^2.0.5",
-    "framer-motion": "^10.16.16",
-    "lucide-react": "^0.294.0",
-    "preshape": "^19.1.0",
+    "framer-motion": "11.5.6",
+    "lucide-react": "0.445.0",
+    "preshape": "^19.1.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "sat": "^0.9.0",
-    "uuid": "^9.0.1"
+    "uuid": "10.0.0"
   },
   "devDependencies": {
     "@svgr/cli": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@swc/core": "^1.4.2",
     "@types/file-saver": "^2.0.7",
     "@types/sat": "^0.0.35",
-    "@types/uuid": "^9.0.7"
+    "@types/uuid": "10.0.0"
   }
 }

workspaces/circular-sequence/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "circular-sequence"
+name = "circular_sequence"
 version = "0.0.0"
 edition = "2021"
 authors = ["Harry Hogg <[email protected]>"]

workspaces/circular-sequence/package.json

@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@hogg/common": "workspace:^",
-    "lucide-react": "0.439.0",
-    "preshape": "^19.1.0",
+    "lucide-react": "0.445.0",
+    "preshape": "^19.1.5",
     "react": "^18.2.0",
     "uuid": "10.0.0"
   },

workspaces/circular-sequence/src-rust/lib.rs

@@ -11,4 +11,4 @@ pub use min_permutation::{get_min_permutation, reverse};
 pub use sequence::{get_length, get_symmetry_index, insert, is_symmetrical, Sequence};
 pub use sequence_store::SequenceStore;
 pub use sort::{compare, sort};
-pub use to_string::to_string;
+pub use to_string::{to_string, to_string_one};

workspaces/circular-sequence/src-rust/sequence.rs

@@ -1,7 +1,10 @@
+use typeshare::typeshare;
+
 #[path = "./sequence_tests.rs"]
 #[cfg(test)]
 mod tests;
 
+#[typeshare]
 pub type Sequence = [u8; 12];
 
 /// Returns the length of a sequence.

workspaces/circular-sequence/src-rust/sequence_store.rs

@@ -20,6 +20,13 @@ impl SequenceStore {
     self.sequences.get(index as usize)
   }
 
+  pub fn get_index(&self, sequence: &Sequence) -> Option<u8> {
+    match self.get_match(sequence) {
+      Match::Exact(index) => Some(index),
+      _ => None,
+    }
+  }
+
   pub fn get_match(&self, sequence: &Sequence) -> Match {
     get_match(sequence, &self.sequences)
   }

workspaces/common/package.json

@@ -6,9 +6,10 @@
   "type": "module",
   "main": "./src/index.ts",
   "dependencies": {
-    "framer-motion": "^10.16.16",
-    "lucide-react": "^0.294.0",
-    "preshape": "^19.1.0",
+    "framer-motion": "11.5.6",
+    "lucide-react": "0.445.0",
+    "luxon": "3.5.0",
+    "preshape": "^19.1.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.20.1",

workspaces/common/src/Article/ArticleFigCodeBlock.tsx

@@ -52,6 +52,7 @@ export default function ArticleFigCodeBlock({
           borderSize="x1"
           flex="vertical"
           grow
+          padding="x6"
           minWidth="0px"
         >
           {presentation}
@@ -69,13 +70,10 @@ export default function ArticleFigCodeBlock({
         <Text basis="0" flex="horizontal" grow minWidth={0} size="x3">
           <Motion
             basis="0"
-            // animate={{ height: isExpanded ? 'auto' : '300px' }}
-            // initial={{ height: '300px' }}
             flex="vertical"
             grow
             overflow="auto"
             ref={refCodeBlock}
-            // maxHeight="300px"
           >
             <CodeBlock grow language={language} padding="x6">
               {contents}

workspaces/common/src/ProjectPage/ProjectPageHeader.tsx

@@ -1,8 +1,12 @@
 import { Box, BoxProps, Text } from 'preshape';
+import { formateDate } from '../utils';
 import { useProjectPageContext } from './useProjectPageContext';
 
 export default function ProjectPageHeader(props: BoxProps) {
-  const { name, description, wip } = useProjectPageContext();
+  const { name, description, created, updated, wip } = useProjectPageContext();
+  const createdString = formateDate(created);
+  const updatedString = formateDate(updated);
+  const showUpdated = createdString !== updatedString;
 
   return (
     <Box {...props}>
@@ -14,7 +18,7 @@ export default function ProjectPageHeader(props: BoxProps) {
         {description}
       </Text>
 
-      {wip && (
+      {wip ? (
         <Text
           backgroundColor="accent-shade-1"
           borderRadius="x1"
@@ -25,7 +29,11 @@ export default function ProjectPageHeader(props: BoxProps) {
           size="x3"
           weight="x3"
         >
-          WIP
+          Work In Progress
+        </Text>
+      ) : (
+        <Text size="x3" weight="x2">
+          Written {createdString} {showUpdated && `· Updated ${updatedString}`}
         </Text>
       )}
     </Box>

workspaces/common/src/ProjectWindow/ProjectHeader.tsx

@@ -0,0 +1,15 @@
+import { Box, BoxProps } from 'preshape';
+
+export default function ProjectHeader(props: BoxProps) {
+  return (
+    <Box
+      alignChildrenHorizontal="between"
+      {...props}
+      alignChildrenVertical="middle"
+      flex="horizontal"
+      gap="x4"
+      padding="x4"
+      paddingVertical="x2"
+    />
+  );
+}

workspaces/common/src/ProjectWindow/ProjectHeaderGroup.tsx

@@ -0,0 +1,5 @@
+import { Box, BoxProps } from 'preshape';
+
+export default function ProjectHeaderGroup(props: BoxProps) {
+  return <Box {...props} />;
+}