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

Merging with community development #2

Open
36 of 75 tasks
modos189 opened this issue Nov 21, 2018 · 39 comments
Open
36 of 75 tasks

Merging with community development #2

modos189 opened this issue Nov 21, 2018 · 39 comments
Labels
development general development issue enhancement New feature or request

Comments

@modos189
Copy link
Contributor

modos189 commented Nov 21, 2018

Development has stopped in the main project, but third-party developers continue to improve IITC.

The goal of this project is to adopt useful Pull-Requests, and to continue the development of IITC with the provision of an updatable site, script and mobile application.

Prompt delivery of updates will soon be very important when Niantic is engaged in updating the Intel map.

You need to check these changes, and if they are good, then take the project:

Core

Fixes

Not needed / reverted

  • Fix. Touch events default passive to false #1261 by ReinRaus [Fixed by update leaflet]
  • enable click in portalinfo on smartphone #1125 by HubertZhang reverted by 2b37b00
  • Fix Intel Map URL #1291 by lm9 [not need anymore]

Plugins:

New

Enhancements:

  • [keys] add accesskey shortcuts for incrementing/decrementing key count #855 by danmana
  • Sync, keys and keys-on-map: Implement the "Capsule concept" for portal keys #1160 by IIGhouLII
  • score-cycle-times: adds dialog with all checkpoints in current cycle #859 by golesny
  • score-cycle-times: Remove seconds, regardless if it has AM/PM or not. #968 by imsaguy
  • Fly-links: Region selection with the draw-tool plugin #1084 by Fly33
  • Portal counts plugin will show the amount of resonators as well #1089 by schoentoon
  • Change visited neutral portal fill when uniques are highlighted #1119 by benjamincuningham
  • Update portal-highlighter-portal-ap.user.js #1135 by swined
  • Portals-list fix #1169 by McBen and Add mapZoomHasPortals and additional JSDoc #3 by hayeswise
  • Add drawtools support and improve portal list display #1190 by pleasantone
  • Add HOOK to "userLocation" plugin #1177 by ZasoGD
  • Fix a typo in plugins/regions.user.js #1213 by felixonmars
  • [Canvas] Specify order so Scriptish Load Canvas before IITC by specifying run-at #947 by MikePach [not need anymore]
  • Add ability to change how far each button press will pan #918 by nexushoratio

bookmarks-by-zaso

draw-tools

  • Update draw-tools.user.js #1033 by ATXadam
    (Add Merge option to allow pasting of new draw tools in existing draw tools memory)
    Added “Paste and Keep Data” feature to draw tools plugin #914 by markfguerra
  • Correct import issue with (new) standard intel #1290 by EvoldicA
  • draw-tools: Remove duplicate links in copy URL #1270 by nheir
  • Strip invalid characters from beginning and end of pasted strings #1242 by retsoksirhc

cross_link

player-tracker

Maps

modos189 added a commit that referenced this issue Nov 22, 2018
* Added runtime permissions request for location plugin
* Apache HTTP Client replaced by OkHttpClient

used developments iitc-project/ingress-intel-total-conversion#1286
#2
@johnd0e
Copy link
Contributor

johnd0e commented Nov 23, 2018

Hi.
Have you seen this earlier attempt to adopt community PRs?
https://github.com/Sinnohd/ingress-intel-total-conversion

There is another alive fork: https://github.com/McBen/ingress-intel-total-conversion
(there is updated leaflet, among other changes)

@modos189
Copy link
Contributor Author

@johnd0e Hi. Thank you, https://github.com/Sinnohd/ingress-intel-total-conversion is not seen, but if I understand correctly, there is only adopt community PRs.

And https://github.com/McBen/ingress-intel-total-conversion repository saw, with its help updated the mobile application.

@johnd0e
Copy link
Contributor

johnd0e commented Nov 23, 2018

but if I understand correctly, there is only adopt community PRs.

Yes.

with its help updated the mobile application.

As I can see, McBen's fork is oriented more toward desktop iitc.
I tried mobile version from that sources and there were some problems with McBen's additional menu (may be I did it wrong, though).

@johnd0e
Copy link
Contributor

johnd0e commented Nov 23, 2018

BTW, there are more useful ideas.
E.g. see https://github.com/inok6743/iitc, where whole iitc can be (auto)built via Travis CI.

@modos189
Copy link
Contributor Author

modos189 commented Nov 23, 2018

and there were some problems with McBen's additional menu

You can test the application I built from my repository https://play.google.com/store/apps/details?id=org.exarhteam.iitc_mobile

Deploy via Travis CI is very interesting, thanks

@johnd0e
Copy link
Contributor

johnd0e commented Nov 24, 2018

You can test the application I built from my repository https://play.google.com/store/apps/details?id=org.exarhteam.iitc_mobile

Thanks, iitc in material design looks great!

modos189 added a commit that referenced this issue Nov 27, 2018
The replacement is the standard PLUGINSTART code followed by "use strict";. by @hayeswise

iitc-project/ingress-intel-total-conversion#1187
#2
modos189 added a commit that referenced this issue Nov 27, 2018
This critically allows you to search for "Toilets" and get results near your area where amenity=toilets :) @nhamer

iitc-project/ingress-intel-total-conversion#1246
#2
modos189 added a commit that referenced this issue Nov 27, 2018
iitc-project/ingress-intel-total-conversion#1125
#2

When pressed, the hover event is triggered, so I do not see the need, but the change will not be superfluous
modos189 added a commit that referenced this issue Nov 28, 2018
This will re-position the drop down box of the bookmarks plugin further down right so it does not interfere with the location of the scale plugin.
by @tsager

iitc-project/ingress-intel-total-conversion#1098
#2
modos189 added a commit that referenced this issue Nov 28, 2018
modos189 added a commit that referenced this issue Nov 28, 2018
Smaller requests are quicker and allows requesting timed-out cells more quickly. by @ah42
iitc-project/ingress-intel-total-conversion#1131
#2
@johnd0e
Copy link
Contributor

johnd0e commented Dec 3, 2018

Consider these externals updates:
Bing: McBen@3d83d8c
KML: McBen@db2ac16
autolink: McBen@a96dce1

Another map tiles set:
McBen@c2ed293

These small fixes to plugins:
bookmarks: McBen@42935b7
uniques: McBen@aa19314

These big changes:
scoreboard: https://github.com/McBen/ingress-intel-total-conversion/blob/master/code/dialog_region_scoreboard.js
cross_link: https://github.com/McBen/ingress-intel-total-conversion/commits/master/plugins/cross_link.user.js
though not sure if last two is finished (and may be there are more commits)

--
iitc-project/ingress-intel-total-conversion#1314

@johnd0e
Copy link
Contributor

johnd0e commented Dec 3, 2018

Some other features I was able to find in McBen's fork:

@johnd0e
Copy link
Contributor

johnd0e commented Dec 7, 2018

Note: McBen does not update that branch anymore, it is now merged in McBen/ingress-intel-total-conversion/master (and it still continues to update).

@johnd0e
Copy link
Contributor

johnd0e commented Dec 7, 2018

[x] Fix. Touch events default passive to false #1261

It appears checked, but in fact I am unable to see corresponding changes in sources.
(As I understand, that PR is unlikely needed after leaflet update)

@modos189
Copy link
Contributor Author

modos189 commented Dec 7, 2018

PR is unlikely needed after leaflet update

I agree, update Leaflet should correct the error. However, I have worked before)

@johnd0e
Copy link
Contributor

johnd0e commented Dec 7, 2018

But question is: have you merged that PR here, in master?

@modos189
Copy link
Contributor Author

modos189 commented Dec 7, 2018

No, just updated leaflet

@johnd0e
Copy link
Contributor

johnd0e commented Dec 7, 2018

No

That's what I'm telling about.
But in first message of this issue this PR looks like merged:

[x] Fix. Touch events default passive to false #1261

So I suppose we should clear check mark (or even remove that item).

@modos189
Copy link
Contributor Author

modos189 commented Dec 7, 2018

I edited the list, added an comment that corrected by update Leaflet

tumik pushed a commit to tumik/iitc that referenced this issue Jan 28, 2019
…tes the project to use Gradle as the build system and adopt the new project structure. build.py is also updated for Gradle. To build with Gradle manually, simply execute ./gradlew assembleDebug and the wrapper will automatically fetch the actual Gradle runtime and dependencies for you (No, you don't even need to download Gradle manually).

This commit also bumps the target API to 21 (5.0 Lollipop).

iitc-project/ingress-intel-total-conversion#942
IITC-CE#2
tumik pushed a commit to tumik/iitc that referenced this issue Jan 28, 2019
…o 4.6.

Implemented automatic copying of IITC script when building a mobile application from Android Studio

IITC-CE#2
@johnd0e
Copy link
Contributor

johnd0e commented Jan 29, 2019

It appears that there are useful PRs even among closed, e.g. author:michaeldever.

And may be it's even worth to check some private branches, like https://github.com/michaeldever/ingress-intel-total-conversion/commits/dialog-buttons

@johnd0e
Copy link
Contributor

johnd0e commented Jan 30, 2019

portals-list.user.js.patch
--- E:/portals-list.user.js	Ср окт 31 13:38:12 2018
+++ E:/portals-list_alcr-mod.user.js	Ср окт 31 14:07:53 2018
@@ -67,8 +67,8 @@ window.plugin.portalslist.filter = 0;
 window.plugin.portalslist.fields = [
   {
     title: "Portal Name",
-    value: function(portal) { return portal.options.data.title; },
-    sortValue: function(value, portal) { return value.toLowerCase(); },
+    value: function(portal) { try { return portal.options.data.title; } catch(e) { return e.message;}; },
+    sortValue: function(value, portal) { try { return value.toLowerCase(); } catch(e) { return e.message;}; },
     format: function(cell, portal, value) {
       $(cell)
         .append(plugin.portalslist.getPortalLink(portal))
@@ -77,7 +77,7 @@ window.plugin.portalslist.fields = [
   },
   {
     title: "Level",
-    value: function(portal) { return portal.options.data.level; },
+    value: function(portal) { try { if (portal.options.data.level) return portal.options.data.level; else return 0; } catch(e) { return 0;};},
     format: function(cell, portal, value) {
       $(cell)
         .css('background-color', COLORS_LVL[value])
@@ -87,7 +87,7 @@ window.plugin.portalslist.fields = [
   },
   {
     title: "Team",
-    value: function(portal) { return portal.options.team; },
+    value: function(portal) { try { return portal.options.team; } catch(e) { return 'ERR';};},
     format: function(cell, portal, value) {
       $(cell).text(['NEU', 'RES', 'ENL'][value]);
     }
@@ -94,8 +94,8 @@ window.plugin.portalslist.fields = [
   },
   {
     title: "Health",
-    value: function(portal) { return portal.options.data.health; },
-    sortValue: function(value, portal) { return portal.options.team===TEAM_NONE ? -1 : value; },
+    value: function(portal) { try { if (portal.options.data.health) return portal.options.data.health; return 0; } catch(e) { return -2;}; },
+    sortValue: function(value, portal) { try { return portal.options.team===TEAM_NONE ? -1 : value; } catch(e) { return -2;}; },
     format: function(cell, portal, value) {
       $(cell)
         .addClass("alignR")
@@ -105,7 +105,7 @@ window.plugin.portalslist.fields = [
   },
   {
     title: "Res",
-    value: function(portal) { return portal.options.data.resCount; },
+    value: function(portal) { try { return portal.options.data.resCount; } catch(e) { return -1;}; },
     format: function(cell, portal, value) {
       $(cell)
         .addClass("alignR")
@@ -115,8 +115,8 @@ window.plugin.portalslist.fields = [
   },
   {
     title: "Links",
-    value: function(portal) { return window.getPortalLinks(portal.options.guid); },
-    sortValue: function(value, portal) { return value.in.length + value.out.length; },
+    value: function(portal) { try { return window.getPortalLinks(portal.options.guid); } catch(e) { return -1;}; },
+    sortValue: function(value, portal) { try { return value.in.length + value.out.length; } catch(e) { return -1;}; },
     format: function(cell, portal, value) {
       $(cell)
         .addClass("alignR")
@@ -128,7 +128,7 @@ window.plugin.portalslist.fields = [
   },
   {
     title: "Fields",
-    value: function(portal) { return getPortalFieldsCount(portal.options.guid) },
+    value: function(portal) { try { return getPortalFieldsCount(portal.options.guid) } catch(e) { return -1;}; },
     format: function(cell, portal, value) {
       $(cell)
         .addClass("alignR")
@@ -139,11 +139,13 @@ window.plugin.portalslist.fields = [
   {
     title: "AP",
     value: function(portal) {
+      try {
       var links = window.getPortalLinks(portal.options.guid);
       var fields = getPortalFieldsCount(portal.options.guid);
       return portalApGainMaths(portal.options.data.resCount, links.in.length+links.out.length, fields);
+      } catch(e) { return portalApGainMaths(0, 0, 0);};
     },
-    sortValue: function(value, portal) { return value.enemyAp; },
+    sortValue: function(value, portal) { try { return value.enemyAp; } catch(e) { return -1;}; },
     format: function(cell, portal, value) {
       var title = '';
       if (teamStringToId(PLAYER.team) == portal.options.team) {
@@ -378,6 +380,7 @@ window.plugin.portalslist.portalTable = function(s
 //               double click: zoom to and select portal
 // code from getPortalLink function by xelio from iitc: AP List - https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/plugins/ap-list.user.js
 window.plugin.portalslist.getPortalLink = function(portal) {
+  try {
   var coord = portal.getLatLng();
   var perma = '/intel?ll='+coord.lat+','+coord.lng+'&z=17&pll='+coord.lat+','+coord.lng;
 
@@ -396,6 +399,9 @@ window.plugin.portalslist.getPortalLink = function
     return false;
   });
   return link;
+  } catch (e) {
+    return e.message;
+  }
 }
 
 window.plugin.portalslist.onPaneChanged = function(pane) {

@johnd0e
Copy link
Contributor

johnd0e commented Feb 5, 2019

  • New tiles thunderforest #1284

The service is not free now, so we can't include it with IITC.

I see there are many such services.. May be we could provide them on separate page.

@johnd0e johnd0e mentioned this issue Feb 5, 2019
4 tasks
@johnd0e johnd0e pinned this issue Feb 20, 2019
johnd0e pushed a commit to johnd0e/ingress-intel-total-conversion that referenced this issue Feb 25, 2019
modos189 added a commit that referenced this issue Mar 13, 2019
* Modify "China" boundary for offset fix plugin
iitc-project/ingress-intel-total-conversion#1188 #2

* Update Fix Google Map offsets in China to GoogleMutant. But not working =(
The plugin changes coordinates, but the change is not applied

* An example of a working solution. Described in more detail in a task
#64

* Smooth operation with map, fixed get map options, fixed download of map tiles (except Google maps)

* fix-googlemap-china-offset: fix style issues

lint:
* `let` is not in es5
* 'HK_LENGTH' is assigned a value but never used
* 'original' is defined but never used

style:
* == vs ===
* Mixed spaces and tabs
* fix indents, missed/extra/trailing spaces, missed semi

* Fix offset in Google maps

* Rename to fix-china-offset.user.js

* Edited the documentation, because now plugin works not only in Google maps

* fix-googlemap-china-offset: refactoring

divide PRCoords into 2 distinct functions:
* plugin.fixChinaOffset.isInGoogle
* plugin.fixChinaOffset.gcjObfs

added stub for old fix-googlemap-china-offset plugin

* fixup! fix-googlemap-china-offset: refactoring

* Revert changes in Leaflet.GoogleMutant.js

* Rename fix-china-offset -> fix-china-map-offset

* Previous indent returned

* Update plugins/fix-china-map-offset.js

Co-Authored-By: modos189 <[email protected]>

* Update plugins/fix-china-map-offset.js

Co-Authored-By: modos189 <[email protected]>

* Update plugins/fix-china-map-offset.js

Co-Authored-By: modos189 <[email protected]>

* fix-china-map-offset: Baidu support

* Sources refactored to be closer to upstream https://github.com/Artoria2e5/PRCoords
* Baidu support
* Clarify comment about usage

* fix-china-map-offset: appied to googleMutant

* fix-china-map-offset: fix filename

* fix-china-map-offset: fixme: options for HongKong and map type

* fixup! fix-china-map-offset: fixme: options for HongKong and map type

* fix-china-map-offset: refactor (intermediate function eliminated)

* fix-china-map-offset: refactor (redefine leaflet methods cleaner)

* fix-china-map-offset: cosmetics (restore original source indents)

* fix-china-map-offset: change leaflet extending

do not touch L.GridLayer
extend L.TileLayer and L.GridLayer.GoogleMutant

* fix-china-map-offset: set 'needFixChinaOffset' option in boot.js

* fix-china-map-offset: fix: put actions into setup function

* fix-china-map-offset: patch GoogleMutant in plugin completely (not in boot.js)

* fixup! fix-china-map-offset: cosmetics (restore original source indents)

* fix-china-map-offset: remove Baidu-stuff

In current state it doesn't function.
Maybe someone reimplement it in future.
More info here: #64.

* fix-china-map-offset: shorten 'namespace' access

* fix-china-map-offset: fix: L.Util may not be available yet

* fix-china-map-offset: fix: namespace conflict
johnd0e pushed a commit to johnd0e/ingress-intel-total-conversion that referenced this issue Mar 14, 2019
@johnd0e
Copy link
Contributor

johnd0e commented Apr 23, 2019

Some code to look:

@modos189
Copy link
Contributor Author

fixed chrome on ubuntu font problems

I don't understand why this change. It just breaks fonts.

johnd0e pushed a commit to johnd0e/ingress-intel-total-conversion that referenced this issue Jul 2, 2019
iitc-project/ingress-intel-total-conversion#1000

Squashed commit of the following:

commit a4ec9ba
Merge: fce1561 495a635
Author: insane210 <[email protected]>
Date:   Wed May 27 23:56:11 2015 +0200

    Merge pull request IITC-CE#2 from jonatkins/master

    update

commit fce1561
Merge: d076335 3aa0838
Author: insane210 <[email protected]>
Date:   Wed May 27 22:28:55 2015 +0200

    Merge pull request #1 from insane210/plugin

    New Plugin: Hide UI

commit 3aa0838
Author: insane210 <[email protected]>
Date:   Wed May 27 22:25:03 2015 +0200

    Update hide-ui.user.js

commit 7af7665
Author: insane210 <[email protected]>
Date:   Wed May 27 19:30:21 2015 +0200

    Update hide-ui.user.js

commit a48a1aa
Author: insane210 <[email protected]>
Date:   Wed May 27 19:23:20 2015 +0200

    Update hide-ui.user.js

commit afc2391
Author: insane210 <[email protected]>
Date:   Tue May 26 01:54:05 2015 +0200

    Update hide-ui.user.js

commit 81443b2
Author: insane210 <[email protected]>
Date:   Sun May 24 02:11:20 2015 +0200

    Update hide-ui.user.js

commit 1bbc41d
Author: insane210 <[email protected]>
Date:   Sun May 17 00:56:42 2015 +0200

    Update hide-ui.user.js

commit 4b5d343
Author: insane210 <[email protected]>
Date:   Sun May 17 00:54:08 2015 +0200

    Update and rename custom-ui.user.js to hide-ui.user.js

commit b423408
Author: insane210 <[email protected]>
Date:   Sat Apr 25 18:10:25 2015 +0200

    Update custom-ui.user.js

commit b0b4eec
Author: insane210 <[email protected]>
Date:   Mon Apr 6 00:11:15 2015 +0200

    Update and rename screenshot-mode.user.js to custom-ui.user.js

commit d076335
Author: insane210 <[email protected]>
Date:   Sat Mar 21 23:39:01 2015 +0100

    Create screenshot-mode.user.js
@johnd0e johnd0e mentioned this issue Jul 11, 2019
3 tasks
@MysticJay
Copy link
Contributor

MysticJay commented Sep 4, 2019

HackRange added to zapRange-plugin, renamed to Portal-Range

@MysticJay
Copy link
Contributor

#1014 not possible due to missing details form intel.

@johnd0e
Copy link
Contributor

johnd0e commented Sep 4, 2019

#1014 not possible due to missing details form intel.

It is possible, but still against our policy (due to bulk requests).

@MysticJay
Copy link
Contributor

Sure. I recommend to close #1014

@ph3arr3t

This comment has been minimized.

@modos189

This comment has been minimized.

@johnd0e
Copy link
Contributor

johnd0e commented Dec 18, 2019

DrawTools: send the layerGroup when running edit and delete hooks #1049

@ph3arr3t

This comment has been minimized.

@ph3arr3t

This comment has been minimized.

@johnd0e

This comment has been minimized.

@IITC-CE IITC-CE locked and limited conversation to collaborators Feb 12, 2020
@johnd0e johnd0e removed the good first issue Good for newcomers label Feb 13, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
development general development issue enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

5 participants