Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix @types+proj4+2.5.5 patch and update Readme for conflicting peer d… #38

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ Extract the source code in a directory, then from the directory:
npm install
ng serve
```
If you have some "Conflicting peer dependency" or other error you can try

```bash
npm install --legacy-peer-deps
export NODE_OPTIONS=--openssl-legacy-provider; ng serve
```


After a while, the application should be available from your browser at http://localhost:4200.

Expand Down
1 change: 1 addition & 0 deletions dist.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

export NODE_OPTIONS=--openssl-legacy-provider;
yarn
rm -fr dist
npm run electron-build
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
diff --git a/node_modules/@types/proj4/index.d.ts b/node_modules/@types/proj4/index.d.ts
index d7d4cf1..d1edc36 100644
index 6ba042e..e57f696 100644
--- a/node_modules/@types/proj4/index.d.ts
+++ b/node_modules/@types/proj4/index.d.ts
@@ -112,5 +112,6 @@ declare function proj4<T extends proj4.TemplateCoordinates>(
coordinates: T
@@ -107,5 +107,5 @@ declare function proj4<T extends proj4.TemplateCoordinates>(
coordinates: T,
): T;

-export = proj4;
+// export = proj4;
+export default proj4;
export as namespace proj4;
8 changes: 4 additions & 4 deletions src/app/images-tagger/images-tagger.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@ input {
position: absolute;
right: 10px;
top: 0;
cursor: pointer;
cursor: pointer;
}
}

.dyn-w{
width: 33% !important;
width: 100% !important;
}

@media (max-width: 768px) {
.dyn-w{
width: 50% !important;
width: 100% !important;
}
}

@media (max-width: 576px) {
.dyn-w{
width: 100% !important;
}
}
}
8 changes: 4 additions & 4 deletions src/app/smartimage/smartimage.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
position: relative;
overflow: hidden;
max-width: 10000px;
max-height: 320px;
max-height: 800px;
}

.img-fluid{
image-rendering: pixelated;
max-width: 10000px;
max-height: 320px;
max-width: 10000px;
max-height: 800px;
}

.gm-style-pbc {
Expand Down Expand Up @@ -42,4 +42,4 @@
-webkit-transform: translateY(-50%);
-ms-transform: translateY(-50%);
transform: translateY(-50%);
}
}